diff options
| author |  Zach Hilman | 2019-10-05 00:09:11 -0400 |
|---|---|---|
| committer | Zach Hilman | 2019-10-05 00:09:11 -0400 |
| commit | d45ad75404e75d2d4fbf3cc0d01d4a01cda1dabb (patch) | |
| tree | ab25815c1ade5a487b4b8f59d76a2a36ed6bda17 /.ci/scripts/windows | |
| parent | Merge pull request #2917 from FernandoS27/fermi-deduction-2 (diff) | |
| download | yuzu-d45ad75404e75d2d4fbf3cc0d01d4a01cda1dabb.tar.gz yuzu-d45ad75404e75d2d4fbf3cc0d01d4a01cda1dabb.tar.xz yuzu-d45ad75404e75d2d4fbf3cc0d01d4a01cda1dabb.zip | |
ci: Add version counter variable
Diffstat (limited to '.ci/scripts/windows')
| -rw-r--r-- | .ci/scripts/windows/docker.sh | 2 | ||||
| -rw-r--r-- | .ci/scripts/windows/exec.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index f7093363b..e8f26933a 100644 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh | |||
| @@ -13,7 +13,7 @@ echo '' >> /bin/cmd | |||
| 13 | chmod +x /bin/cmd | 13 | chmod +x /bin/cmd |
| 14 | 14 | ||
| 15 | mkdir build || true && cd build | 15 | mkdir build || true && cd build |
| 16 | cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_UNICORN=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release | 16 | cmake .. -G Ninja -DDISPLAY_VERSION=$1 -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" -DUSE_CCACHE=ON -DYUZU_USE_BUNDLED_UNICORN=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DCMAKE_BUILD_TYPE=Release |
| 17 | ninja | 17 | ninja |
| 18 | 18 | ||
| 19 | # Clean up the dirty hacks | 19 | # Clean up the dirty hacks |
diff --git a/.ci/scripts/windows/exec.sh b/.ci/scripts/windows/exec.sh index d6a994856..4155ed5fc 100644 --- a/.ci/scripts/windows/exec.sh +++ b/.ci/scripts/windows/exec.sh | |||
| @@ -2,4 +2,4 @@ | |||
| 2 | 2 | ||
| 3 | mkdir -p "ccache" || true | 3 | mkdir -p "ccache" || true |
| 4 | chmod a+x ./.ci/scripts/windows/docker.sh | 4 | chmod a+x ./.ci/scripts/windows/docker.sh |
| 5 | docker run -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-mingw /bin/bash -ex /yuzu/.ci/scripts/windows/docker.sh | 5 | docker run -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-mingw /bin/bash -ex /yuzu/.ci/scripts/windows/docker.sh $1 |