Browse Source

Fix Win64 build to actually run and only download the x64 parts of MinGW (#1022)

pull/483/head
Trihedraf 5 years ago committed by GitHub
parent
commit
a29a59d8d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      .circleci/config.yml
  2. 8
      README.md

8
.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)

8
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

Loading…
Cancel
Save