diff options
| author | sfan5 <sfan5@live.de> | 2020-09-25 18:23:05 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2020-09-25 18:23:05 +0200 |
| commit | 5e4ec15e6cf378e8d0c6aa81968351d35499fb4a (patch) | |
| tree | cc03d91fb14f9a87dc94d7a5a01f49081c29a500 /ci | |
| parent | 82eda2e5f8ca4cb083e692b375a7dad0efde2efb (diff) | |
| download | mpv-5e4ec15e6cf378e8d0c6aa81968351d35499fb4a.tar.bz2 mpv-5e4ec15e6cf378e8d0c6aa81968351d35499fb4a.tar.xz | |
ci: fix spirv-cross build in mingw scripts
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build-mingw64.sh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ci/build-mingw64.sh b/ci/build-mingw64.sh index 6789072b1f..77a7c99cbb 100755 --- a/ci/build-mingw64.sh +++ b/ci/build-mingw64.sh @@ -73,8 +73,8 @@ if [ ! -e "$prefix_dir/lib/libavcodec.dll.a" ]; then popd fi -## shaderc + spirv-cross -if [ ! -e "$prefix_dir/lib/libspirv-cross-c-shared.dll.a" ]; then +## shaderc +if [ ! -e "$prefix_dir/lib/libshaderc_shared.dll.a" ]; then if [ ! -d shaderc ]; then $gitclone https://github.com/google/shaderc.git (cd shaderc && ./utils/git-sync-deps) @@ -85,7 +85,12 @@ if [ ! -e "$prefix_dir/lib/libspirv-cross-c-shared.dll.a" ]; then -DSHADERC_SKIP_TESTS=ON -DCMAKE_INSTALL_PREFIX=/ makeplusinstall popd - builddir shaderc/third_party/spirv-cross +fi + +## spirv-cross +if [ ! -e "$prefix_dir/lib/libspirv-cross-c-shared.dll.a" ]; then + [ -d SPIRV-Cross ] || $gitclone https://github.com/KhronosGroup/SPIRV-Cross + builddir SPIRV-Cross cmake .. -DCMAKE_SYSTEM_NAME=Windows \ -DSPIRV_CROSS_SHARED=ON -DSPIRV_CROSS_{CLI,STATIC}=OFF makeplusinstall |