summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@centrum.cz>2021-09-20 00:17:15 +0000
committerLuboš Luňák <l.lunak@collabora.com>2021-09-21 10:30:00 +0200
commit9714f3348d972a179e73423c44a97954bf6cc534 (patch)
tree2520427b61ffc1632751023cf561a5f1126f08f9 /external
parent2a357832b9eedea161f593c1b3bf8dd973949c95 (diff)
do not special-case Clang for Skia on Windows Arm64
We hard-require Clang for Skia, because MSVC compiles it poorly. Somebody who doesn't want or can't use Clang may just as well use --disable-skia. This reverts commit 77ba9a095b0b3f429e006571e16f8320ba0bb61e. This reverts commit b36df65bb2393f8f46eea68c861d7570e7a772a1. Change-Id: If0310ce13e4023c6ae43f96447b48665ab7e4353 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122336 Tested-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'external')
-rw-r--r--external/skia/Library_skia.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index b1b4f874f44a..0989e7e337c9 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -13,12 +13,8 @@ $(eval $(call gb_Library_set_warnings_disabled,skia))
$(eval $(call gb_Library_use_unpacked,skia,skia))
-ifneq ($(OS)_$(CPUNAME),WNT_AARCH64)
$(eval $(call gb_Library_use_clang,skia))
$(eval $(call gb_Library_set_clang_precompiled_header,skia,external/skia/inc/pch/precompiled_skia))
-else
-$(eval $(call gb_Library_set_precompiled_header,skia,external/skia/inc/pch/precompiled_skia))
-endif
$(eval $(call gb_Library_add_defs,skia,\
-DSKIA_IMPLEMENTATION=1 \