diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@oracle.com> | 2011-04-04 11:40:41 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 13:26:42 +0200 |
| commit | 45bf496656a7c4cd69ee055a72cf9d8c37e7e806 (patch) | |
| tree | 3c0005acd99bec7124ef685e4c2395f1247c3414 | |
| parent | 10cd2060e705cace2ed34ce866bb3ec801fe7e3c (diff) | |
ooo34gsl01: #i117680# fixup graphite_dll as static library [hg:859f1dffdb89]
| -rwxr-xr-x | vcl/Library_vcl.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index e8ad1bcaed64..7e2269580fda 100755 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -81,13 +81,6 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ $(gb_STDLIBS) \ )) -ifneq ($(ENABLE_GRAPHITE),) -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,vcl,\ - graphite_dll \ -)) -endif -endif ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_add_linked_libs,vcl,\ freetype \ @@ -423,6 +416,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ ## handle Graphite ifneq ($(ENABLE_GRAPHITE),) +# add defines, graphite sources for all platforms $(eval $(call gb_Library_set_defs,vcl,\ $$(DEFS) \ -DENABLE_GRAPHITE \ @@ -433,6 +427,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/glyphs/graphite_layout \ vcl/source/glyphs/graphite_textsrc \ )) +# handle X11 platforms, which have additional files and possibly system graphite ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/glyphs/graphite_adaptors \ @@ -449,6 +444,12 @@ $(eval $(call gb_Library_add_linked_static_libs,vcl,\ )) endif endif +# on windows link static graphite library +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_static_libs,vcl,\ + graphite \ +)) +endif endif ifeq ($(OS),LINUX) |