From 5e4ec15e6cf378e8d0c6aa81968351d35499fb4a Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Fri, 25 Sep 2020 18:23:05 +0200
Subject: ci: fix spirv-cross build in mingw scripts

---
 ci/build-mingw64.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'ci')

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
-- 
cgit v1.2.3