external/skia/Library_skia.mk | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 44ab745e8d702b2ad0e14a023ddb7269dc6c1306
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Sat Aug 21 16:23:24 2021 +0200
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Mon Aug 23 14:58:15 2021 +0200
fix Skia linking on Mac
Change-Id: I4ae0ca2baedd533ee4dc115332255e334633cecf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120817
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index ad55400a24e5..517b5585496e 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -62,7 +62,7 @@ $(eval $(call gb_Library_use_system_win32_libs,skia,\
else ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_use_system_darwin_frameworks,skia,\
- Carbon \
+ Cocoa \
))
ifneq ($(SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX),)
@@ -905,9 +905,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/utils/mac/SkCreateCGImageRef \
))
-$(eval $(call gb_Library_add_generated_objcxxobjects,skia,\
- UnpackedTarball/skia/tools/sk_app/mac/RasterWindowContext_mac \
-))
+# Not used, uses OpenGL -
UnpackedTarball/skia/tools/sk_app/mac/RasterWindowContext_mac
# UnpackedTarball/skia/tools/sk_app/mac/VulkanWindowContext_mac \
# UnpackedTarball/skia/tools/sk_app/mac/MetalWindowContext_mac \
