diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-25 22:24:54 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-26 10:14:29 +0100 |
| commit | 5958f74e8a975115ae3af03cced4f8dde825451e (patch) | |
| tree | f0c0ba1b175b47f7d8f9469c149739b37b471fd1 /vcl | |
| parent | ed63fde85b6b37d464a926c0c5508eb10c4e6464 (diff) | |
use configured freetype and fontconfig flags, at end of link link
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vcl.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 20927c7e1077..ffa137ca3ef1 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -55,12 +55,6 @@ $(eval $(call gb_Library_set_include,vcl,\ $(WINEINCLUDE) \ -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,\ -DVCL_DLLIMPLEMENTATION \ @@ -480,9 +474,9 @@ $(eval $(call gb_Library_use_external,vcl,cairo)) endif ifeq ($(GUIBASE),unx) -$(eval $(call gb_Library_add_ldflags,vcl,\ - $$(FONTCONFIG_LIBS) \ - $$(FREETYPE_LIBS) \ +$(eval $(call gb_Library_use_externals,vcl,\ + fontconfig \ + freetype \ )) endif |