summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossy@jrg.systems>2020-12-18 23:38:36 +1100
committerJames Ross-Gowan <rossy@jrg.systems>2020-12-18 23:38:36 +1100
commit34ff967520c849ce547fe42af279b76ceddc6d3c (patch)
treec68303e80dc9981a589e67edc3df505bab863322
parent4029a695b5c6431ab2548f63614a89b1b6f04d93 (diff)
downloadmpv-appveyor.tar.bz2
mpv-appveyor.tar.xz
appveyor: use MSYS2 shaderc packageappveyor
There's a shaderc package in MSYS2 now. Using it should shave ten minutes off the appveyor build.
-rwxr-xr-xTOOLS/appveyor-install.sh12
1 files changed, 1 insertions, 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