diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-22 12:26:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-22 12:46:55 +0100 |
| commit | 8fdcbfe58681752727e658071937177f6ee79ceb (patch) | |
| tree | 9798e87007eaad07ed0fd4a674dc8d8c3bc4d259 /vcl/Library_vcl.mk | |
| parent | a7e20d7ae2d39dc8e5a87852ea492e556dbf1c9e (diff) | |
dewrap fontconfig and link directly, remove non-fontconfig paths
Diffstat (limited to 'vcl/Library_vcl.mk')
| -rw-r--r-- | vcl/Library_vcl.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index c0eb89e04eeb..8811bda29661 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_set_include,vcl,\ ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_set_cxxflags,vcl,\ $$(CXXFLAGS) \ + $$(FONTCONFIG_CFLAGS) \ $$(FREETYPE_CFLAGS) \ )) endif @@ -84,12 +85,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ $(gb_STDLIBS) \ )) -ifeq ($(GUIBASE),unx) -$(eval $(call gb_Library_add_linked_libs,vcl,\ - freetype \ -)) -endif - ifeq ($(GUIBASE),aqua) $(eval $(call gb_Library_set_cxxflags,vcl,\ $$(CXXFLAGS) \ @@ -444,6 +439,14 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ endif endif +ifeq ($(GUIBASE),unx) +$(eval $(call gb_Library_set_ldflags,vcl,\ + $$(LDFLAGS) \ + $$(FONTCONFIG_LIBS) \ + $$(FREETYPE_LIBS) \ +)) +endif + ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_linked_libs,vcl,\ dl \ |