summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlat9nq <lat9nq@gmail.com>2022-05-29 09:35:08 +0200
committerlat9nq <lat9nq@gmail.com>2022-06-17 05:57:39 +0200
commitc42fde2a373f676b5464168a8df14b22c6b46755 (patch)
tree0edc04f8fce4a6b3773257a3007519aecd7fb1f1
parentCMakeModules: Add MinGWClangCross (diff)
downloadyuzu-c42fde2a373f676b5464168a8df14b22c6b46755.tar
yuzu-c42fde2a373f676b5464168a8df14b22c6b46755.tar.gz
yuzu-c42fde2a373f676b5464168a8df14b22c6b46755.tar.bz2
yuzu-c42fde2a373f676b5464168a8df14b22c6b46755.tar.lz
yuzu-c42fde2a373f676b5464168a8df14b22c6b46755.tar.xz
yuzu-c42fde2a373f676b5464168a8df14b22c6b46755.tar.zst
yuzu-c42fde2a373f676b5464168a8df14b22c6b46755.zip
-rwxr-xr-x.ci/scripts/windows/docker.sh14
1 files changed, 11 insertions, 3 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh
index d1a0d6ab9..f53d837d1 100755
--- a/.ci/scripts/windows/docker.sh
+++ b/.ci/scripts/windows/docker.sh
@@ -1,19 +1,27 @@
#!/bin/bash -ex
+set -e
+
cd /yuzu
ccache -s
mkdir build || true && cd build
+LDFLAGS="-fuse-ld=lld"
+# -femulated-tls required due to an incompatibility between GCC and Clang
+# TODO(lat9nq): If this is widespread, we probably need to add this to CMakeLists where appropriate
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWCross.cmake" \
+ -DCMAKE_CXX_FLAGS="-femulated-tls" \
+ -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWClangCross.cmake" \
-DDISPLAY_VERSION=$1 \
-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \
-DENABLE_QT_TRANSLATION=ON \
-DUSE_CCACHE=ON \
- -GNinja \
-ninja
+ -DYUZU_USE_BUNDLED_SDL2=OFF \
+ -DYUZU_USE_EXTERNAL_SDL2=OFF \
+ -GNinja
+ninja yuzu yuzu-cmd
ccache -s