From 34ff967520c849ce547fe42af279b76ceddc6d3c Mon Sep 17 00:00:00 2001 From: James Ross-Gowan Date: Fri, 18 Dec 2020 23:38:36 +1100 Subject: appveyor: use MSYS2 shaderc package There's a shaderc package in MSYS2 now. Using it should shave ten minutes off the appveyor build. --- TOOLS/appveyor-install.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/TOOLS/appveyor-install.sh b/TOOLS/appveyor-install.sh index 7b2473f39d..835850abf1 100755 --- a/TOOLS/appveyor-install.sh +++ b/TOOLS/appveyor-install.sh @@ -23,6 +23,7 @@ pacman -S --noconfirm --needed \ $MINGW_PACKAGE_PREFIX-lua51 \ $MINGW_PACKAGE_PREFIX-ninja \ $MINGW_PACKAGE_PREFIX-rubberband \ + $MINGW_PACKAGE_PREFIX-shaderc \ $MINGW_PACKAGE_PREFIX-uchardet \ $MINGW_PACKAGE_PREFIX-vulkan @@ -51,17 +52,6 @@ pacman -Sc --noconfirm make -j4 install ) -# Compile shaderc -( - git clone --depth=1 https://github.com/google/shaderc && cd shaderc - "$PYTHON" utils/git-sync-deps - - mkdir build && cd build - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DSHADERC_SKIP_TESTS=ON \ - -DCMAKE_INSTALL_PREFIX=$MINGW_PREFIX .. - ninja install -) - # Compile SPIRV-Cross ( git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Cross && cd SPIRV-Cross -- cgit v1.2.3