diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-07 23:28:45 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-08 17:49:56 +0200 |
| commit | 8db0275b2645c5cf745aaa4b9f9bd9c11cf11607 (patch) | |
| tree | e5c61abad3b98523fd0157ea171acd61b387509f | |
| parent | 5e037bbb3b7a0fdbbd4ce53e6ad566db057e1575 (diff) | |
harfbuzz: stop delivering headers
Change-Id: I6a68b2df3a5bd4076e07729b675179e52f4f0615
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | harfbuzz/ExternalPackage_harfbuzz.mk | 17 | ||||
| -rw-r--r-- | vcl/generic/glyphs/gcach_layout.cxx | 4 |
3 files changed, 6 insertions, 19 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 3fa45242243e..deb040621226 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1217,6 +1217,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ harfbuzz \ )) define gb_LinkTarget__use_harfbuzz +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,harfbuzz)/src \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_package,$(1),\ harfbuzz \ ) diff --git a/harfbuzz/ExternalPackage_harfbuzz.mk b/harfbuzz/ExternalPackage_harfbuzz.mk index 0894b2e79a77..cb3339d21661 100644 --- a/harfbuzz/ExternalPackage_harfbuzz.mk +++ b/harfbuzz/ExternalPackage_harfbuzz.mk @@ -9,23 +9,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,harfbuzz,harfbuzz)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,harfbuzz,inc/external/harfbuzz,\ - src/hb.h \ - src/hb-blob.h \ - src/hb-buffer.h \ - src/hb-common.h \ - src/hb-font.h \ - src/hb-icu.h \ - src/hb-ot.h \ - src/hb-ot-layout.h \ - src/hb-ot-tag.h \ - src/hb-set.h \ - src/hb-shape.h \ - src/hb-shape-plan.h \ - src/hb-unicode.h \ - src/hb-version.h \ -)) - $(eval $(call gb_ExternalPackage_use_external_project,harfbuzz,harfbuzz)) $(eval $(call gb_ExternalPackage_add_file,harfbuzz,lib/libharfbuzz.a,src/.libs/libharfbuzz.a)) diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 7df803f1315c..55ddaee28931 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -30,8 +30,8 @@ #include <sal/alloca.h> #include <rtl/instance.hxx> -#include <harfbuzz/hb-icu.h> -#include <harfbuzz/hb-ot.h> +#include <hb-icu.h> +#include <hb-ot.h> #include <layout/LayoutEngine.h> #include <layout/LEFontInstance.h> |