diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-24 14:35:18 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-24 16:52:01 +0200 |
| commit | 962771f7d5c353fa861fce4b5a3a612a1d76bca5 (patch) | |
| tree | d1862f9e2116fb2805ef6a33cec38c31aeb57b7c /vcl | |
| parent | 4eb68428f676121340bb1533742635f28081e26a (diff) | |
stop delivering freetype headers
Change-Id: I8e14cc411520272969cfd24048e403b9fd53cde4
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/Library_vclplug_svp.mk | 5 | ||||
| -rw-r--r-- | vcl/StaticLibrary_headless.mk | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 32e88dd6b112..e465c851a029 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -24,10 +24,6 @@ $(eval $(call gb_Library_set_include,vclplug_svp,\ -I$(SRCDIR)/vcl/inc \ )) -$(eval $(call gb_Library_add_cxxflags,vclplug_svp,\ - $$(FREETYPE_CFLAGS) \ -)) - $(eval $(call gb_Library_add_defs,vclplug_svp,\ -DVCLPLUG_SVP_IMPLEMENTATION \ )) @@ -54,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\ $(eval $(call gb_Library_use_externals,vclplug_svp,\ boost_headers \ + freetype_headers \ icule \ icuuc \ )) diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index 6d179b68cab7..b09dad7eaaab 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -8,17 +8,16 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,headless)) -$(eval $(call gb_StaticLibrary_use_external,headless,boost_headers)) +$(eval $(call gb_StaticLibrary_use_externals,headless,\ + boost_headers \ + freetype_headers \ +)) $(eval $(call gb_StaticLibrary_use_api,headless,\ offapi \ udkapi \ )) -$(eval $(call gb_StaticLibrary_add_cxxflags,headless,\ - $$(FREETYPE_CFLAGS) \ -)) - $(eval $(call gb_StaticLibrary_add_exception_objects,headless,\ vcl/headless/svpbmp \ vcl/headless/svpdummies \ |