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 /vcl | |
| 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 'vcl')
| -rw-r--r-- | vcl/Library_vclplug_gen.mk | 4 | ||||
| -rw-r--r-- | vcl/Library_vclplug_osx.mk | 5 | ||||
| -rw-r--r-- | vcl/Library_vclplug_win.mk | 8 |
3 files changed, 1 insertions, 16 deletions
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 49f0bbf4b2ac..2d314017bb8b 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -63,7 +63,6 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\ Xrender \ $(if $(filter SKIA,$(BUILD_TYPE)), \ skia \ - libpng \ fontconfig \ ) \ )) @@ -73,9 +72,6 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\ -lXext \ -lSM \ -lICE \ - $(if $(filter SKIA,$(BUILD_TYPE)), \ - -lX11-xcb \ - ) \ )) $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\ diff --git a/vcl/Library_vclplug_osx.mk b/vcl/Library_vclplug_osx.mk index 82c4928dddb1..0545af8dd33a 100644 --- a/vcl/Library_vclplug_osx.mk +++ b/vcl/Library_vclplug_osx.mk @@ -65,7 +65,6 @@ $(eval $(call gb_Library_use_externals,vclplug_osx,\ harfbuzz \ $(if $(filter SKIA,$(BUILD_TYPE)), \ skia \ - libpng \ ) \ )) @@ -155,10 +154,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vclplug_osx,\ Cocoa \ Carbon \ CoreFoundation \ - $(if $(filter SKIA,$(BUILD_TYPE)), \ - QuartzCore \ - Metal \ - ) \ )) ifneq ($(ENABLE_MACOSX_SANDBOX),TRUE) diff --git a/vcl/Library_vclplug_win.mk b/vcl/Library_vclplug_win.mk index 8a5ced42ee45..d4656302d4ce 100644 --- a/vcl/Library_vclplug_win.mk +++ b/vcl/Library_vclplug_win.mk @@ -61,10 +61,7 @@ $(eval $(call gb_Library_use_externals,vclplug_win,\ boost_headers \ epoxy \ harfbuzz \ - $(if $(filter SKIA,$(BUILD_TYPE)), \ - skia \ - libpng \ - ) \ + $(if $(filter SKIA,$(BUILD_TYPE)),skia) \ )) $(eval $(call gb_Library_add_exception_objects,vclplug_win,\ @@ -118,9 +115,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_win,\ )) $(eval $(call gb_Library_use_system_win32_libs,vclplug_win,\ - $(if $(filter SKIA,$(BUILD_TYPE)), \ - usp10 \ - ) \ advapi32 \ d2d1 \ dwmapi \ |