diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-10-17 12:07:48 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-11-27 09:55:08 +0100 |
| commit | a81cddb3b2bc2848111eb3781c26acdab7baf628 (patch) | |
| tree | 9e5ab1f7bd2601654e5dc1eca1ce6f497e4588fd /RepositoryExternal.mk | |
| parent | a8b73758e723656173aebaaa9d94926b03ca01d4 (diff) | |
use the same config file for skia build and using it
So that the setup is consistent.
Change-Id: Ia113c7bf79036e3ec7585263ed70da68e461fbac
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index b2a4ef548163..08ae4da20179 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -114,15 +114,20 @@ endif ifneq ($(ENABLE_SKIA),) define gb_LinkTarget__use_skia $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,skia)/include/core \ - -I$(call gb_UnpackedTarball_get_dir,skia)/include/config \ - -I$(call gb_UnpackedTarball_get_dir,skia) \ - $$(INCLUDE) \ + -I$(call gb_UnpackedTarball_get_dir,skia)/include/core \ + -I$(call gb_UnpackedTarball_get_dir,skia)/include/config \ + -I$(call gb_UnpackedTarball_get_dir,skia)/include/third_party/vulkan \ + -I$(call gb_UnpackedTarball_get_dir,skia) \ + $$(INCLUDE) \ ) $(call gb_LinkTarget_use_libraries,$(1),skia) +$(call gb_LinkTarget_add_defs,$(1),\ + -DSK_USER_CONFIG_HEADER="<$(BUILDDIR)/config_host/config_skia.h>" \ + -DSKIA_DLL \ +) endef $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\ - skia \ + skia \ )) endif |