Kaydet (Commit) 5958f74e authored tarafından Caolán McNamara's avatar Caolán McNamara

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

üst ed63fde8
...@@ -55,12 +55,6 @@ $(eval $(call gb_Library_set_include,vcl,\ ...@@ -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)) ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment