strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use configured freetype and fontconfig flags, at end of link link

Browse source
This commit is contained in:
Caolán McNamara 2011-07-25 22:24:54 +01:00
parent ed63fde85b
commit 5958f74e8a
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
vcl/Library_vcl.mk
View file

@ -55,12 +55,6 @@ $(eval $(call gb_Library_set_include,vcl,\
$(WINEINCLUDE) \ $(WINEINCLUDE) \
-I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \ -I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \
)) ))
ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_add_cxxflags,vcl,\
$$(FONTCONFIG_CFLAGS) \
$$(FREETYPE_CFLAGS) \
))
endif
$(eval $(call gb_Library_add_defs,vcl,\ $(eval $(call gb_Library_add_defs,vcl,\
-DVCL_DLLIMPLEMENTATION \ -DVCL_DLLIMPLEMENTATION \
@ -480,9 +474,9 @@ $(eval $(call gb_Library_use_external,vcl,cairo))
endif endif
ifeq ($(GUIBASE),unx) ifeq ($(GUIBASE),unx)
$(eval $(call gb_Library_add_ldflags,vcl,\ $(eval $(call gb_Library_use_externals,vcl,\
$$(FONTCONFIG_LIBS) \ fontconfig \
$$(FREETYPE_LIBS) \ freetype \
)) ))
endif endif