Compare commits
6
Commits
842c36fde6
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6f1fb2c80a | ||
|
|
660474c8bd | ||
|
|
fb2ea1a1fe | ||
|
|
46a05c0e88 | ||
|
|
429c8a55e7 | ||
|
|
39113ae51a |
No files matched your search
@@ -0,0 +1,15 @@
|
||||
# Changelog
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
### Fixed
|
||||
- `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
|
||||
- `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,4 +1,6 @@
|
||||
@echo off
|
||||
setlocal
|
||||
|
||||
if "%1"=="run" (
|
||||
if "%2"=="" (
|
||||
make -f gmake.mk run MODE=debug
|
||||
|
||||
@@ -1,6 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
OS=$(uname -s | tr '[:upper:]' '[:lower:]')
|
||||
UNAME_S=$(uname -s)
|
||||
export UNAME_S
|
||||
|
||||
OS=$(echo "$UNAME_S" | tr '[:upper:]' '[:lower:]')
|
||||
|
||||
if [ "$OS" = "freebsd" ]; then
|
||||
MK_FILE="bmake.mk"
|
||||
@@ -8,6 +11,11 @@ else
|
||||
MK_FILE="gmake.mk"
|
||||
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
|
||||
GL_MAJOR=3
|
||||
GL_MINOR=1
|
||||
@@ -26,11 +34,25 @@ for arg in "$@"; do
|
||||
done
|
||||
|
||||
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
|
||||
make -f "$MK_FILE" release GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR
|
||||
make -f "$MK_FILE" release GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR || exit 1
|
||||
fi
|
||||
|
||||
if [ "$(id -u)" = "0" ]; then
|
||||
if [ "$IS_WIN" = "1" ] || [ "$(id -u)" = "0" ]; then
|
||||
PRIV=""
|
||||
elif command -v doas > /dev/null 2>&1; then
|
||||
PRIV="doas"
|
||||
@@ -41,7 +63,7 @@ if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
$PRIV make -f "$MK_FILE" "$@" GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR
|
||||
$PRIV make -f "$MK_FILE" $PRIV_ARGS GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR
|
||||
elif [ "$1" = "run" ]; then
|
||||
make -f "$MK_FILE" run GL_MAJOR=$GL_MAJOR GL_MINOR=$GL_MINOR
|
||||
elif [ "$1" = "run_gl" ]; then
|
||||
|
||||
@@ -1,4 +1,18 @@
|
||||
ifeq ($(OS),Windows_NT)
|
||||
ifeq ($(UNAME_S),)
|
||||
UNAME_S := $(shell uname -s)
|
||||
endif
|
||||
ifneq (,$(filter MINGW% MSYS% UCRT% CLANG% CYGWIN%,$(UNAME_S)))
|
||||
IS_WINDOWS := 1
|
||||
IS_POSIX_SHELL := 1
|
||||
else ifeq ($(OS),Windows_NT)
|
||||
IS_WINDOWS := 1
|
||||
IS_POSIX_SHELL :=
|
||||
else
|
||||
IS_WINDOWS :=
|
||||
IS_POSIX_SHELL := 1
|
||||
endif
|
||||
|
||||
ifeq ($(IS_WINDOWS),1)
|
||||
CLOCK_SRC := src/platform/clock/win32.c
|
||||
INPUT_SRC := src/platform/client/input/sdl.c
|
||||
else
|
||||
@@ -19,8 +33,7 @@ LIBSKELE_SRCS := $(ENGINE_SRCS) $(SOFT_PLAT_SRCS)
|
||||
LIBGLSKELE_SRCS := $(ENGINE_SRCS) $(GL_PLAT_SRCS)
|
||||
LIBSKELE_SRV_SRCS := $(ENGINE_SRCS)
|
||||
|
||||
ifeq ($(OS),Windows_NT)
|
||||
SHELL := cmd.exe
|
||||
ifeq ($(IS_WINDOWS),1)
|
||||
LIBSKELE := $(BIN_DIR)/debug/libskele.a
|
||||
LIBGLSKELE := $(BIN_DIR)/debug/libglskele.a
|
||||
LIBSKELE_SRV := $(BIN_DIR)/debug/libskeleserver.a
|
||||
@@ -35,8 +48,6 @@ ifeq ($(OS),Windows_NT)
|
||||
SERVER_BIN_R := $(BIN_DIR)/release/skele_server.exe
|
||||
LDFLAGS_PLAT :=
|
||||
CFLAGS_PLAT :=
|
||||
MKDIR = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1))
|
||||
RMDIR = if exist $(subst /,\,$(1)) rd /s /q $(subst /,\,$(1))
|
||||
else
|
||||
LIBSKELE := $(BIN_DIR)/debug/libskele.a
|
||||
LIBGLSKELE := $(BIN_DIR)/debug/libglskele.a
|
||||
@@ -52,11 +63,18 @@ else
|
||||
SERVER_BIN_R := $(BIN_DIR)/release/skele_server
|
||||
LDFLAGS_PLAT :=
|
||||
CFLAGS_PLAT :=
|
||||
MKDIR = mkdir -p $(1)
|
||||
RMDIR = rm -rf $(1)
|
||||
endif
|
||||
|
||||
ifeq ($(OS),Windows_NT)
|
||||
ifeq ($(IS_POSIX_SHELL),1)
|
||||
MKDIR = mkdir -p $(1)
|
||||
RMDIR = rm -rf $(1)
|
||||
else
|
||||
SHELL := cmd.exe
|
||||
MKDIR = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1))
|
||||
RMDIR = if exist $(subst /,\,$(1)) rd /s /q $(subst /,\,$(1))
|
||||
endif
|
||||
|
||||
ifeq ($(IS_WINDOWS),1)
|
||||
GL_LIB := -lopengl32
|
||||
LDFLAGS_PLAT :=
|
||||
CFLAGS_PLAT :=
|
||||
|
||||
Reference in new issue
Block a user