diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-08-21 16:23:24 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-08-23 14:58:15 +0200 |
| commit | 44ab745e8d702b2ad0e14a023ddb7269dc6c1306 (patch) | |
| tree | 955ca5a1d4fa0411fa1456b9d2df0b5e1158495d /external/skia | |
| parent | osl::Mutex->std::mutex in AccessibleEventNotifier (diff) | |
| download | core-44ab745e8d702b2ad0e14a023ddb7269dc6c1306.tar.gz core-44ab745e8d702b2ad0e14a023ddb7269dc6c1306.zip | |
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.lunak@collabora.com>
Diffstat (limited to 'external/skia')
| -rw-r--r-- | external/skia/Library_skia.mk | 6 |
1 files changed, 2 insertions, 4 deletions
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 \ |