diff options
author | James Ross-Gowan <rossy@jrg.systems> | 2019-04-16 20:54:05 +1000 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2019-04-16 21:35:00 +0300 |
commit | 4e9dc60d9e7728cddfc901a8b0b7048eeebed5e6 (patch) | |
tree | 01e36a0403d8e50dd3f237b3dcc3a7a2ec3d8a0b /TOOLS | |
parent | 7f1d7c38bcadf982e1bf087327cb445de5e20391 (diff) | |
download | mpv-4e9dc60d9e7728cddfc901a8b0b7048eeebed5e6.tar.bz2 mpv-4e9dc60d9e7728cddfc901a8b0b7048eeebed5e6.tar.xz |
appveyor: fix shaderc dependencies
Shaderc comes with a Python script that automatically fetches
"known-good" versions of its dependencies. Use that instead of manually
cloning dependencies to third-party.
Diffstat (limited to 'TOOLS')
-rwxr-xr-x | TOOLS/appveyor-install.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/TOOLS/appveyor-install.sh b/TOOLS/appveyor-install.sh index 7c0a345ebe..28e0674581 100755 --- a/TOOLS/appveyor-install.sh +++ b/TOOLS/appveyor-install.sh @@ -1,6 +1,8 @@ #!/usr/bin/bash set -e +export PYTHON=/usr/bin/python3 + # Write an empty fonts.conf to speed up fc-cache export FONTCONFIG_FILE=/dummy-fonts.conf cat >"$FONTCONFIG_FILE" <<EOF @@ -52,15 +54,12 @@ pacman -Sc --noconfirm # Compile shaderc ( git clone --depth=1 https://github.com/google/shaderc && cd shaderc - git clone --depth=1 https://github.com/google/glslang.git third_party/glslang - git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Tools.git third_party/spirv-tools - git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers.git third_party/spirv-headers + "$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 - cp -f libshaderc/libshaderc_shared.dll $MINGW_PREFIX/bin/ ) # Compile crossc |