summaryrefslogtreecommitdiff
path: root/vcl/Library_vclplug_win.mk
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2024-03-16 13:21:03 +0100
committerNoel Grandin <noel.grandin@collabora.co.uk>2024-03-16 16:02:31 +0100
commitd097dbc8688b32e7865eca3baab1dd406c306441 (patch)
tree462b2fceb3932f38154e16e9c439fd6ab6cc03f5 /vcl/Library_vclplug_win.mk
parent3ccaed03f7680bad28a6ecf03f10d8c77221c83c (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/Library_vclplug_win.mk')
-rw-r--r--vcl/Library_vclplug_win.mk8
1 files changed, 1 insertions, 7 deletions
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 \