ref: 913facd74869bfd99ccdadbc0ced674d135a46e3
parent: ae7d809837d788a32a28c4ce50ece3e037c4d069
author: Tanguy Fautre <[email protected]>
date: Sat Feb 22 14:11:10 EST 2020
Split completely x86 and x64 build files.
--- a/.github/workflows/windows.yml
+++ /dev/null
@@ -1,25 +1,0 @@
-name: Windows CI
-
-on: [push, pull_request]
-
-jobs:
- build:
-
- runs-on: windows-latest
- steps:
- - uses: actions/checkout@v2
- - name: Compile vcpkg dependencies
- run: vcpkg_windows.bat
- shell: cmd
- # This is where GitHub actions on Windows get really nonsensical.
- # MSBuild is not on the path by default, despite this running on a Windows / Visual Studio 2019 docker image.
- # We currently use 3rd party action to avoid hard coding the path to MSBuild.
- # Comedy bonus: GitHub is now owned by Microsoft.
- - name: Setup MSBuild
- uses: warrenbuckley/Setup-MSBuild@v1
- - name: Compile Duke3D x86
- run: build_windows_x86.bat
- shell: cmd
- - name: Compile Duke3D x64
- run: build_windows_x64.bat
- shell: cmd
--- /dev/null
+++ b/.github/workflows/windows_x64.yml
@@ -1,0 +1,22 @@
+name: Windows x64 CI
+
+on: [push, pull_request]
+
+jobs:
+ build:
+
+ runs-on: windows-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Compile vcpkg dependencies
+ run: vcpkg_windows_x64.bat
+ shell: cmd
+ # This is where GitHub actions on Windows get really nonsensical.
+ # MSBuild is not on the path by default, despite this running on a Windows / Visual Studio 2019 docker image.
+ # We currently use 3rd party action to avoid hard coding the path to MSBuild.
+ # Comedy bonus: GitHub is now owned by Microsoft.
+ - name: Setup MSBuild
+ uses: warrenbuckley/Setup-MSBuild@v1
+ - name: Compile Duke3D
+ run: build_windows_x64.bat
+ shell: cmd
--- /dev/null
+++ b/.github/workflows/windows_x86.yml
@@ -1,0 +1,22 @@
+name: Windows x86 CI
+
+on: [push, pull_request]
+
+jobs:
+ build:
+
+ runs-on: windows-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Compile vcpkg dependencies
+ run: vcpkg_windows_x86.bat
+ shell: cmd
+ # This is where GitHub actions on Windows get really nonsensical.
+ # MSBuild is not on the path by default, despite this running on a Windows / Visual Studio 2019 docker image.
+ # We currently use 3rd party action to avoid hard coding the path to MSBuild.
+ # Comedy bonus: GitHub is now owned by Microsoft.
+ - name: Setup MSBuild
+ uses: warrenbuckley/Setup-MSBuild@v1
+ - name: Compile Duke3D
+ run: build_windows_x86.bat
+ shell: cmd
--- a/README.md
+++ b/README.md
@@ -34,9 +34,15 @@
## Build
-**Windows (Visual Studio 2019 x64 solution)** [](https://github.com/GPSnoopy/BelgianChocolateDuke3D/actions?query=workflow%3A%22Windows+CI%22)
+**Windows (Visual Studio 2019 x86 solution)** [](https://github.com/GPSnoopy/BelgianChocolateDuke3D/actions?query=workflow%3A%22Windows+x86+CI%22)
```
-> vcpkg_windows.bat
+> vcpkg_windows_x86.bat
+> build_windows_x86.bat
+```
+
+**Windows (Visual Studio 2019 x64 solution)** [](https://github.com/GPSnoopy/BelgianChocolateDuke3D/actions?query=workflow%3A%22Windows+x64+CI%22)
+```
+> vcpkg_windows_x64.bat
> build_windows_x64.bat
```
--- a/build_windows_x64.bat
+++ b/build_windows_x64.bat
@@ -1,7 +1,7 @@
cd build || goto :error
mkdir windows.x64 || goto :error
cd windows.x64 || goto :error
-cmake -D VCPKG_TARGET_TRIPLET=x64-windows-static -D CMAKE_TOOLCHAIN_FILE=../vcpkg.windows/scripts/buildsystems/vcpkg.cmake -G "Visual Studio 16 2019" -A "x64" ../.. || goto :error
+cmake -D VCPKG_TARGET_TRIPLET=x64-windows-static -D CMAKE_TOOLCHAIN_FILE=../vcpkg.windows.x64/scripts/buildsystems/vcpkg.cmake -G "Visual Studio 16 2019" -A "x64" ../.. || goto :error
msbuild BelgianChocolateDuke3D.sln /t:Rebuild /p:Configuration=Release /p:Platform=x64 || goto :error
cd ..
cd ..
--- a/build_windows_x86.bat
+++ b/build_windows_x86.bat
@@ -1,7 +1,7 @@
cd build || goto :error
mkdir windows.x86 || goto :error
cd windows.x86 || goto :error
-cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static -D CMAKE_TOOLCHAIN_FILE=../vcpkg.windows/scripts/buildsystems/vcpkg.cmake -G "Visual Studio 16 2019" -A "Win32" ../.. || goto :error
+cmake -D VCPKG_TARGET_TRIPLET=x86-windows-static -D CMAKE_TOOLCHAIN_FILE=../vcpkg.windows.x86/scripts/buildsystems/vcpkg.cmake -G "Visual Studio 16 2019" -A "Win32" ../.. || goto :error
msbuild BelgianChocolateDuke3D.sln /t:Rebuild /p:Configuration=Release /p:Platform=Win32 || goto :error
cd ..
cd ..
--- a/vcpkg_windows.bat
+++ /dev/null
@@ -1,28 +1,0 @@
-mkdir build
-cd build || goto :error
-git clone https://github.com/Microsoft/vcpkg.git vcpkg.windows || goto :error
-cd vcpkg.windows || goto :error
-git checkout 2020.01 || goto :error
-call bootstrap-vcpkg.bat || goto :error
-
-vcpkg.exe install ^
- enet:x86-windows-static ^
- sdl2:x86-windows-static ^
- sdl2-mixer:x86-windows-static ^
- || goto :error
-
-vcpkg.exe install ^
- enet:x64-windows-static ^
- sdl2:x64-windows-static ^
- sdl2-mixer:x64-windows-static ^
- || goto :error
-
-cd ..
-cd ..
-
-exit /b
-
-
-:error
-echo Failed with error #%errorlevel%.
-exit /b %errorlevel%
--- /dev/null
+++ b/vcpkg_windows_x64.bat
@@ -1,0 +1,22 @@
+mkdir build
+cd build || goto :error
+git clone https://github.com/Microsoft/vcpkg.git vcpkg.windows.x64 || goto :error
+cd vcpkg.windows || goto :error
+git checkout 2020.01 || goto :error
+call bootstrap-vcpkg.bat || goto :error
+
+vcpkg.exe install ^
+ enet:x64-windows-static ^
+ sdl2:x64-windows-static ^
+ sdl2-mixer:x64-windows-static ^
+ || goto :error
+
+cd ..
+cd ..
+
+exit /b
+
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%
--- /dev/null
+++ b/vcpkg_windows_x86.bat
@@ -1,0 +1,22 @@
+mkdir build
+cd build || goto :error
+git clone https://github.com/Microsoft/vcpkg.git vcpkg.windows.x86 || goto :error
+cd vcpkg.windows || goto :error
+git checkout 2020.01 || goto :error
+call bootstrap-vcpkg.bat || goto :error
+
+vcpkg.exe install ^
+ enet:x86-windows-static ^
+ sdl2:x86-windows-static ^
+ sdl2-mixer:x86-windows-static ^
+ || goto :error
+
+cd ..
+cd ..
+
+exit /b
+
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%