From 6a09d376c3762cf293dfa32042c26d860e77d3bb Mon Sep 17 00:00:00 2001 From: anth64 Date: Tue, 10 Nov 2026 18:59:29 +0100 Subject: [PATCH] fix: build.bat builds release before install Matches build.sh: running install without release already built previously just failed or installed stale artifacts. --- CHANGELOG.md | 1 + build.bat | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d755c55..1dea03a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,3 +12,4 @@ so entries here track the template's own history, not a game built from it. - `build.sh`: `uname -s` exported once and reused by make instead of being re-run - `gmake.mk`: stopped relying on the `OS` env var alone (unset under MSYS2), now also detects Windows via `uname -s` (`MINGW*`/`MSYS*`/`UCRT*`/`CLANG*`/`CYGWIN*`), with the native-Windows `cmd.exe` mkdir/rd path reserved for environments without a POSIX shell; fixes MSYS2 builds silently falling through to the Linux `mkdir -p`/`rm -rf` path mismatch - `build.sh`: install/uninstall no longer requires `doas`/`sudo` under MSYS2, where neither exists and `id -u` never reports root +- `build.bat`: now builds `release` before `install`, no separate manual build step needed diff --git a/build.bat b/build.bat index 3384c4a..8486fd1 100644 --- a/build.bat +++ b/build.bat @@ -1,4 +1,16 @@ @echo off +setlocal + +set HAS_INSTALL=0 +for %%a in (%*) do ( + if "%%a"=="install" set HAS_INSTALL=1 +) + +if "%HAS_INSTALL%"=="1" ( + make -f gmake.mk release + if errorlevel 1 exit /b 1 +) + if "%1"=="run" ( if "%2"=="" ( make -f gmake.mk run MODE=debug