diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-03-16 13:21:03 +0100 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-03-16 16:02:31 +0100 |
| commit | d097dbc8688b32e7865eca3baab1dd406c306441 (patch) | |
| tree | 462b2fceb3932f38154e16e9c439fd6ab6cc03f5 /RepositoryExternal.mk | |
| parent | 3ccaed03f7680bad28a6ecf03f10d8c77221c83c (diff) | |
Revert "make skia into static library"
This reverts commit 806b6014db796a3970332f9cefaaabf9355d0d8f.
Reverting for now, this does not work with --enable-mergelib
Change-Id: Ib44f819d0da9ed3769f76fc40b5c15ce097390a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164872
Tested-by: René Engelhard <rene@debian.org>
Reviewed-by: René Engelhard <rene@debian.org>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ffe20765c2fa..60499758de40 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -135,20 +135,15 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(SRCDIR)/external/skia/inc/ \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_use_static_libraries,$(1),skia) +$(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 - -define gb_ExternalProject__use_skia -$(call gb_ExternalProject_use_static_libraries,$(1),\ - skia \ -) - -endef - +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\ + skia \ +)) endif ifeq (SANE,$(filter SANE,$(BUILD_TYPE))) |