diff options
| author | liushuyu <liushuyu011@gmail.com> | 2021-12-23 07:31:57 +0100 |
|---|---|---|
| committer | liushuyu <liushuyu011@gmail.com> | 2022-07-05 05:21:56 +0200 |
| commit | a1815b617ceebf9a0a43c6fb89a13ac7f37f9ba4 (patch) | |
| tree | b5822f53279efae6dc0353732eae08e8d251f3d0 /.ci/scripts | |
| parent | Merge pull request #8521 from lat9nq/gdbstub-in-bounds (diff) | |
| download | yuzu-a1815b617ceebf9a0a43c6fb89a13ac7f37f9ba4.tar yuzu-a1815b617ceebf9a0a43c6fb89a13ac7f37f9ba4.tar.gz yuzu-a1815b617ceebf9a0a43c6fb89a13ac7f37f9ba4.tar.bz2 yuzu-a1815b617ceebf9a0a43c6fb89a13ac7f37f9ba4.tar.lz yuzu-a1815b617ceebf9a0a43c6fb89a13ac7f37f9ba4.tar.xz yuzu-a1815b617ceebf9a0a43c6fb89a13ac7f37f9ba4.tar.zst yuzu-a1815b617ceebf9a0a43c6fb89a13ac7f37f9ba4.zip | |
Diffstat (limited to '.ci/scripts')
| -rwxr-xr-x | .ci/scripts/clang/docker.sh | 2 | ||||
| -rwxr-xr-x | .ci/scripts/linux/docker.sh | 2 | ||||
| -rwxr-xr-x | .ci/scripts/windows/docker.sh | 17 |
3 files changed, 11 insertions, 10 deletions
diff --git a/.ci/scripts/clang/docker.sh b/.ci/scripts/clang/docker.sh index 885d74e97..4bb07105a 100755 --- a/.ci/scripts/clang/docker.sh +++ b/.ci/scripts/clang/docker.sh @@ -3,8 +3,6 @@ # Exit on error, rather than continuing with the rest of the script. set -e -cd /yuzu - ccache -s mkdir build || true && cd build diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index 5070b92d1..38b29294c 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -3,8 +3,6 @@ # Exit on error, rather than continuing with the rest of the script. set -e -cd /yuzu - ccache -s mkdir build || true && cd build 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 \ |