Fix up support for building Xft1, Xrender and fontconfig out of the tree
This commit is contained in:
parent
20ac65ab00
commit
fbb405f3b5
|
@ -1,3 +1,8 @@
|
||||||
|
#ifdef UseInstalled
|
||||||
|
/* building outside the tree, use private defines */
|
||||||
|
#include "../local.def"
|
||||||
|
#endif
|
||||||
|
|
||||||
INCLUDES=$(FREETYPE2INCLUDES) $(LIBXML2INCLUDES) -I..
|
INCLUDES=$(FREETYPE2INCLUDES) $(LIBXML2INCLUDES) -I..
|
||||||
|
|
||||||
LOCAL_LIBRARIES=FontconfigClientLibs
|
LOCAL_LIBRARIES=FontconfigClientLibs
|
||||||
|
|
14
local.def
14
local.def
|
@ -26,6 +26,20 @@
|
||||||
#define _Use _FUse
|
#define _Use _FUse
|
||||||
#define _UseCat _FUseCat
|
#define _UseCat _FUseCat
|
||||||
|
|
||||||
|
#ifndef ExpatClientLibs
|
||||||
|
#define ExpatClientLibs -lexpat
|
||||||
|
#endif
|
||||||
|
#ifndef ExpatClientDepLibs
|
||||||
|
#define ExpatClientDepLibs
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef FontconfigClientDepLibs
|
||||||
|
#define FontconfigClientDepLibs $(DEPFONTCONFIGLIB) $(DEPFREETYPE2LIB) ExpatClientDepLibs
|
||||||
|
#endif
|
||||||
|
#ifndef FontconfigClientLibs
|
||||||
|
#define FontconfigClientLibs $(FONTCONFIGLIB) $(FREETYPE2LIB) ExpatClientLibs
|
||||||
|
#endif
|
||||||
|
|
||||||
#if SharedLibFontconfig
|
#if SharedLibFontconfig
|
||||||
#define SharedFontconfigRev 1.0
|
#define SharedFontconfigRev 1.0
|
||||||
SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGSRC),SOXLIBREV,SharedFontconfigRev)
|
SharedLibReferences(FONTCONFIG,fontconfig,$(FONTCONFIGSRC),SOXLIBREV,SharedFontconfigRev)
|
||||||
|
|
Loading…
Reference in New Issue