diff --git a/CHANGELOG.md b/CHANGELOG.md index 0919d73..009d691 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.1] - 2026-11-09 + +### Fixed +- `build.sh`/`module_template/build.sh`: detect MSYS2 (`MINGW64_NT`/`MINGW32_NT`/`MSYS_NT`/`UCRT64_NT`/`CLANG64_NT` etc.) and route to `gmake.mk` instead of `bmake.mk`; `uname -s` result exported once and reused by make instead of being re-run +- `gmake.mk`/`test/gmake.mk`/`module_template/gmake.mk`: stopped relying on the `OS` env var (unset under MSYS2), now detect Windows via `uname -s` with the native-Windows `cmd.exe`/batch-command path reserved for environments without a POSIX shell; fixes MSYS2 builds failing to link with `cannot find -ldl` + ## [1.0.0] - 2026-09-29 ### Added diff --git a/README.md b/README.md index 04bd4cf..791d743 100644 --- a/README.md +++ b/README.md @@ -236,7 +236,7 @@ stk_init(); ## Project Status -**Current Version:** 1.0.0 +**Current Version:** 1.0.1 ### What Works - Cross-platform module loading and hot-reloading diff --git a/build.sh b/build.sh index f14e46a..0ecefd3 100755 --- a/build.sh +++ b/build.sh @@ -1,12 +1,14 @@ #!/bin/sh -OS=$(uname -s | tr '[:upper:]' '[:lower:]') +UNAME_S=$(uname -s) +export UNAME_S -if [ "$OS" = "linux" ]; then - MK_FILE="gmake.mk" -else - MK_FILE="bmake.mk" -fi +OS=$(echo "$UNAME_S" | tr '[:upper:]' '[:lower:]') + +case "$OS" in + linux|mingw*|msys*|ucrt*|clang*) MK_FILE="gmake.mk" ;; + *) MK_FILE="bmake.mk" ;; +esac HAS_INSTALL=0 HAS_UNINSTALL=0 diff --git a/gmake.mk b/gmake.mk index 3b86054..9974455 100644 --- a/gmake.mk +++ b/gmake.mk @@ -1,22 +1,40 @@ include config.mk -ifeq ($(OS),Windows_NT) - SHELL := cmd.exe +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) FULL_LIB := $(LIB_NAME).dll STATIC_LIB := lib$(LIB_NAME).a LDFLAGS_PLAT := CFLAGS_PLAT := CFLAGS_STATIC := - MKDIR = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1)) - RMDIR = if exist $(subst /,\,$(1)) rd /s /q $(subst /,\,$(1)) else FULL_LIB := lib$(LIB_NAME).so STATIC_LIB := lib$(LIB_NAME).a LDFLAGS_PLAT := -ldl CFLAGS_PLAT := -fPIC CFLAGS_STATIC := +endif + +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 RELEASE_LDFLAGS := -s diff --git a/include/stk_version.h b/include/stk_version.h index a6c7ca9..05b730f 100644 --- a/include/stk_version.h +++ b/include/stk_version.h @@ -3,7 +3,7 @@ #define STK_VERSION_MAJOR 1 #define STK_VERSION_MINOR 0 -#define STK_VERSION_PATCH 0 +#define STK_VERSION_PATCH 1 #define STK_STRINGIFY_HELPER(x) #x #define STK_STRINGIFY(x) STK_STRINGIFY_HELPER(x) diff --git a/module_template/build.sh b/module_template/build.sh index 3df3691..199944b 100755 --- a/module_template/build.sh +++ b/module_template/build.sh @@ -1,11 +1,13 @@ #!/bin/sh -OS=$(uname -s | tr '[:upper:]' '[:lower:]') +UNAME_S=$(uname -s) +export UNAME_S -if [ "$OS" = "linux" ]; then - MK_FILE="gmake.mk" -else - MK_FILE="bmake.mk" -fi +OS=$(echo "$UNAME_S" | tr '[:upper:]' '[:lower:]') + +case "$OS" in + linux|mingw*|msys*|ucrt*|clang*) MK_FILE="gmake.mk" ;; + *) MK_FILE="bmake.mk" ;; +esac make -f "$MK_FILE" "$@" diff --git a/module_template/gmake.mk b/module_template/gmake.mk index 91d42b3..2863f6b 100644 --- a/module_template/gmake.mk +++ b/module_template/gmake.mk @@ -1,14 +1,32 @@ include config.mk -ifeq ($(OS),Windows_NT) - SHELL := cmd.exe +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) MODULE_EXT = .dll - MKDIR = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1)) - RMDIR = if exist $(subst /,\,$(1)) rd /s /q $(subst /,\,$(1)) else MODULE_EXT = .so +endif + +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 CC = cc diff --git a/test/gmake.mk b/test/gmake.mk index 3f7e137..d753364 100644 --- a/test/gmake.mk +++ b/test/gmake.mk @@ -2,9 +2,21 @@ CC := cc CFLAGS = -Wall -Wpedantic -I../include -std=c89 LDFLAGS = -L../bin/debug -lstk -ifeq ($(OS),Windows_NT) - SHELL := cmd.exe - .SHELLFLAGS := /c +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) MODULE_EXT = .dll EXE_EXT = .exe else @@ -13,6 +25,11 @@ else LDFLAGS += -Wl,-rpath,../bin/debug endif +ifneq ($(IS_POSIX_SHELL),1) + SHELL := cmd.exe + .SHELLFLAGS := /c +endif + .PHONY: all test clean all: test @@ -27,28 +44,28 @@ test_mod_dep$(MODULE_EXT): test_mod_dep.c $(CC) $(CFLAGS) -fPIC -shared -o $@ test_mod_dep.c setup: -ifeq ($(OS),Windows_NT) +ifeq ($(IS_POSIX_SHELL),1) + @mkdir -p mods + @cp -f test_mod$(MODULE_EXT) mods/ 2>/dev/null || true + @cp -f test_mod_dep$(MODULE_EXT) mods/ 2>/dev/null || true +else @if not exist mods mkdir mods @if exist test_mod.dll copy /Y test_mod.dll mods\ >nul 2>&1 @if exist test_mod_dep.dll copy /Y test_mod_dep.dll mods\ >nul 2>&1 -else - @mkdir -p mods - @cp -f test_mod.so mods/ 2>/dev/null || true - @cp -f test_mod_dep.so mods/ 2>/dev/null || true endif test: test_program$(EXE_EXT) test_mod$(MODULE_EXT) test_mod_dep$(MODULE_EXT) setup -ifeq ($(OS),Windows_NT) - @set PATH=../bin/debug;%PATH% && cmd /C "test_program.exe" +ifeq ($(IS_POSIX_SHELL),1) + @./test_program$(EXE_EXT) else - @./test_program + @set PATH=../bin/debug;%PATH% && cmd /C "test_program.exe" endif clean: -ifeq ($(OS),Windows_NT) +ifeq ($(IS_POSIX_SHELL),1) + @rm -f test_program$(EXE_EXT) test_mod$(MODULE_EXT) test_mod_dep$(MODULE_EXT) + @rm -rf mods +else @del /Q test_program.exe test_mod.dll test_mod_dep.dll 2>nul || true @rmdir /S /Q mods 2>nul || true -else - @rm -f test_program test_mod.so test_mod_dep.so - @rm -rf mods endif