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. Mirrors the same fix already applied to stk.
This commit is contained in:
1 parent
842c36fde6
commit
91e348311a
2 files changed
+30
-9
No files matched your search
@@ -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