diff options
Diffstat (limited to '')
| -rwxr-xr-x | .ci/scripts/windows/docker.sh | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index f53d837d1..6420c8f7d 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh @@ -2,19 +2,24 @@ set -e -cd /yuzu +#cd /yuzu ccache -s -mkdir build || true && cd build -LDFLAGS="-fuse-ld=lld" +mkdir -p "$HOME/.conan/" +cp -rv /home/yuzu/.conan/profiles/ "$HOME/.conan/" +cp -rv /home/yuzu/.conan/settings.yml "$HOME/.conan/" + +mkdir -p build && cd build +export 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 +export CFLAGS="-femulated-tls" +export CXXFLAGS="${CFLAGS}" cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS="-femulated-tls" \ - -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MinGWClangCross.cmake" \ - -DDISPLAY_VERSION=$1 \ + -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWClangCross.cmake" \ + -DDISPLAY_VERSION="$1" \ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ -DENABLE_QT_TRANSLATION=ON \ -DUSE_CCACHE=ON \ |