From a29a59d8d33e8916c1cc431aafe12268f8a1aead Mon Sep 17 00:00:00 2001 From: Trihedraf Date: Fri, 19 Feb 2021 08:54:19 -0800 Subject: [PATCH] Fix Win64 build to actually run and only download the x64 parts of MinGW (#1022) --- .circleci/config.yml | 8 ++++++-- README.md | 8 +++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 68a6389d5..91a3a01a7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -69,12 +69,16 @@ jobs: - store_artifacts: {path: ./build/devilutionx.exe, destination: devilutionx_x86.exe} windows_x64: docker: - - image: debian:stable + - image: ubuntu:20.04 + environment: + TZ: "America/Los_Angeles" working_directory: ~/repo + environment: + TZ: "America/Los_Angeles" steps: - checkout - run: apt-get update -y - - run: apt-get install -y cmake gcc-mingw-w64 g++-mingw-w64 wget git sudo + - run: DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles" apt-get install -y cmake gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 wget git sudo - run: Packaging/windows/mingw-prep64.sh - run: cmake -S. -Bbuild -DNIGHTLY_BUILD=ON -DCMAKE_TOOLCHAIN_FILE=../CMake/mingwcc64.cmake - run: cmake --build build -j $(nproc) diff --git a/README.md b/README.md index e424ffc65..b054dfe91 100644 --- a/README.md +++ b/README.md @@ -97,8 +97,7 @@ cmake --build . -j $(sysctl -n hw.ncpuonline) ### 32-bit -Download and place the 32bit MinGW Development Libraries of [SDL2](https://www.libsdl.org/download-2.0.php), [SDL2_mixer](https://www.libsdl.org/projects/SDL_mixer/), [SDL2_ttf](https://www.libsdl.org/projects/SDL_ttf/) and [Libsodium](https://github.com/jedisct1/libsodium/releases) in `/usr/i686-w64-mingw32`. This can be done automatically by running -`Packaging/windows/mingw-prep.sh`. +Download and place the 32bit MinGW Development Libraries of [SDL2](https://www.libsdl.org/download-2.0.php), [SDL2_mixer](https://www.libsdl.org/projects/SDL_mixer/), [SDL2_ttf](https://www.libsdl.org/projects/SDL_ttf/) and [Libsodium](https://github.com/jedisct1/libsodium/releases) in `/usr/i686-w64-mingw32`. This can be done automatically by running `Packaging/windows/mingw-prep.sh`. NOTE: SDL2 2.0.12 appears to not compile correctly. ``` @@ -107,12 +106,11 @@ sudo apt-get install cmake gcc-mingw-w64-i686 g++-mingw-w64-i686 ### 64-bit -Download and place the 64bit MinGW Development Libraries of [SDL2](https://www.libsdl.org/download-2.0.php), [SDL2_mixer](https://www.libsdl.org/projects/SDL_mixer/), [SDL2_ttf](https://www.libsdl.org/projects/SDL_ttf/) and [Libsodium](https://github.com/jedisct1/libsodium/releases) in `/usr/x86_64-w64-mingw32`. This can be done automatically by running -`Packaging/windows/mingw-prep64.sh`. +Download and place the 64bit MinGW Development Libraries of [SDL2](https://www.libsdl.org/download-2.0.php), [SDL2_mixer](https://www.libsdl.org/projects/SDL_mixer/), [SDL2_ttf](https://www.libsdl.org/projects/SDL_ttf/) and [Libsodium](https://github.com/jedisct1/libsodium/releases) in `/usr/x86_64-w64-mingw32`. This can be done automatically by running `Packaging/windows/mingw-prep64.sh`. NOTE: SDL2 2.0.12 appears to not compile correctly. ``` -sudo apt-get install cmake gcc-mingw-w64 g++-mingw-w64 +sudo apt-get install cmake gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 ``` ### Compiling