Compare commits

..
2 Commits
Author SHA1 Message Date
anth64 4a22a83ac8 docs: add CHANGELOG.md 2026-11-10 07:50:41 +01:00
anth64 274ea8c3ed fix: support MSYS2 builds on gmake
uname -s under MSYS2 never reports Windows_NT, so gmake.mk's
Windows_NT checks could silently fall through to the Linux path.
Detect MINGW/MSYS/UCRT/CLANG/CYGWIN uname prefixes in build.sh
and gmake.mk, separating "building for Windows" (binary names,
libs) from "running under cmd.exe" (mkdir/rd vs mkdir -p/rm -rf).
MSYS2 keeps the posix shell builtins even when targeting Windows.
2026-11-10 07:50:41 +01:00
5 changed files with 5 additions and 29 deletions

No files matched your search

-3
View File
@@ -11,6 +11,3 @@ so entries here track the template's own history, not a game built from it.
### Fixed ### Fixed
- `build.sh`: `uname -s` exported once and reused by make instead of being re-run - `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 - `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
- `build.sh`: `install`/`uninstall` now only escalate the final install step; other targets (`clean`, etc.) and the release build run as the invoking user, so `build clean install` no longer leaves root-owned `obj/`/`bin/` that break later non-root builds
+1 -1
View File
@@ -124,7 +124,7 @@ ${.CURDIR}/obj/release/server/${_src:S/.c$/.o/}: ${_src}
.-include "obj/release/gl/*.d" .-include "obj/release/gl/*.d"
.-include "obj/release/server/*.d" .-include "obj/release/server/*.d"
install: release install:
install -d ${PREFIX}/bin install -d ${PREFIX}/bin
install -m 755 ${.CURDIR}/${BIN_DIR}/release/${CLIENT_BIN} ${PREFIX}/bin/${CLIENT_BIN} install -m 755 ${.CURDIR}/${BIN_DIR}/release/${CLIENT_BIN} ${PREFIX}/bin/${CLIENT_BIN}
install -m 755 ${.CURDIR}/${BIN_DIR}/release/${GLCLIENT_BIN} ${PREFIX}/bin/${GLCLIENT_BIN} install -m 755 ${.CURDIR}/${BIN_DIR}/release/${GLCLIENT_BIN} ${PREFIX}/bin/${GLCLIENT_BIN}
-2
View File
@@ -1,6 +1,4 @@
@echo off @echo off
setlocal
if "%1"=="run" ( if "%1"=="run" (
if "%2"=="" ( if "%2"=="" (
make -f gmake.mk run MODE=debug make -f gmake.mk run MODE=debug
+3 -22
View File
@@ -11,11 +11,6 @@ else
MK_FILE="gmake.mk" MK_FILE="gmake.mk"
fi fi
case "$OS" in
mingw*|msys*|ucrt*|clang*) IS_WIN=1 ;;
*) IS_WIN=0 ;;
esac
if grep -q "Raspberry Pi 5" /proc/device-tree/model 2>/dev/null; then if grep -q "Raspberry Pi 5" /proc/device-tree/model 2>/dev/null; then
GL_MAJOR=3 GL_MAJOR=3
GL_MINOR=1 GL_MINOR=1
@@ -34,25 +29,11 @@ for arg in "$@"; do
done done
if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then
# build as the invoking user; only install/uninstall step runs privileged,
# so obj/ and bin/ never end up root-owned
BUILD_ARGS=""
PRIV_ARGS=""
for arg in "$@"; do
case "$arg" in
install|uninstall) PRIV_ARGS="$PRIV_ARGS $arg" ;;
*) BUILD_ARGS="$BUILD_ARGS $arg" ;;
esac
done
if [ -n "$BUILD_ARGS" ]; then
make -f "$MK_FILE" $BUILD_ARGS GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR || exit 1
fi
if [ "$HAS_INSTALL" = "1" ]; then if [ "$HAS_INSTALL" = "1" ]; then
make -f "$MK_FILE" release GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR || exit 1 make -f "$MK_FILE" release GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR
fi fi
if [ "$IS_WIN" = "1" ] || [ "$(id -u)" = "0" ]; then if [ "$(id -u)" = "0" ]; then
PRIV="" PRIV=""
elif command -v doas > /dev/null 2>&1; then elif command -v doas > /dev/null 2>&1; then
PRIV="doas" PRIV="doas"
@@ -63,7 +44,7 @@ if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then
exit 1 exit 1
fi fi
$PRIV make -f "$MK_FILE" $PRIV_ARGS GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR $PRIV make -f "$MK_FILE" "$@" GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR
elif [ "$1" = "run" ]; then elif [ "$1" = "run" ]; then
make -f "$MK_FILE" run GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR make -f "$MK_FILE" run GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR
elif [ "$1" = "run_gl" ]; then elif [ "$1" = "run_gl" ]; then
+1 -1
View File
@@ -174,7 +174,7 @@ obj/release/server/%.o: %.c
-include $(wildcard obj/release/gl/*.d) -include $(wildcard obj/release/gl/*.d)
-include $(wildcard obj/release/server/*.d) -include $(wildcard obj/release/server/*.d)
install: release install:
install -d $(PREFIX)/bin install -d $(PREFIX)/bin
install -m 755 $(BIN_DIR)/release/$(CLIENT_BIN) $(PREFIX)/bin/$(CLIENT_BIN) install -m 755 $(BIN_DIR)/release/$(CLIENT_BIN) $(PREFIX)/bin/$(CLIENT_BIN)
install -m 755 $(BIN_DIR)/release/$(GLCLIENT_BIN) $(PREFIX)/bin/$(GLCLIENT_BIN) install -m 755 $(BIN_DIR)/release/$(GLCLIENT_BIN) $(PREFIX)/bin/$(GLCLIENT_BIN)