diff --git a/README.md b/README.md index d3d3c28..8b5cacd 100644 --- a/README.md +++ b/README.md @@ -236,7 +236,7 @@ stk_init(); ## Project Status -**Current Version:** 1.0.2 +**Current Version:** 1.0.3 ### What Works - Cross-platform module loading and hot-reloading diff --git a/bmake.mk b/bmake.mk index 066190d..fe0ef07 100644 --- a/bmake.mk +++ b/bmake.mk @@ -72,8 +72,7 @@ test: debug @echo "=== Building and running stk tests ===" cd ${.CURDIR}/test && ${MAKE} -f bmake.mk -install: - @test -f ${.CURDIR}/${BIN_DIR}/release/${FULL_LIB} || { echo "Run 'make -f bmake.mk release' before installing."; exit 1; } +install: release install -d ${LIBDIR} ${INCDIR}/stk install -m 755 ${.CURDIR}/${BIN_DIR}/release/${FULL_LIB} ${LIBDIR}/ install -m 644 ${.CURDIR}/${BIN_DIR}/release/${STATIC_LIB} ${LIBDIR}/ diff --git a/build.bat b/build.bat index d7ed093..e967eb6 100755 --- a/build.bat +++ b/build.bat @@ -1,14 +1,4 @@ @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 -) - make -f gmake.mk %* diff --git a/build.sh b/build.sh index 82803c0..0af3cc2 100755 --- a/build.sh +++ b/build.sh @@ -25,10 +25,6 @@ for arg in "$@"; do done if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then - if [ "$HAS_INSTALL" = "1" ]; then - make -f "$MK_FILE" release - fi - if [ "$IS_WIN" = "1" ] || [ "$(id -u)" = "0" ]; then PRIV="" elif command -v doas > /dev/null 2>&1; then diff --git a/gmake.mk b/gmake.mk index 9974455..5699de4 100644 --- a/gmake.mk +++ b/gmake.mk @@ -99,8 +99,7 @@ test: debug @$(MAKE) -C test -f gmake.mk ifneq ($(OS),Windows_NT) -install: - @test -f $(BIN_DIR)/release/$(FULL_LIB) || { echo "Run 'make -f gmake.mk release' before installing."; exit 1; } +install: release install -d $(LIBDIR) $(INCDIR)/stk install -m 755 $(BIN_DIR)/release/$(FULL_LIB) $(LIBDIR)/ install -m 644 $(BIN_DIR)/release/$(STATIC_LIB) $(LIBDIR)/ diff --git a/include/stk_version.h b/include/stk_version.h index 9d105b8..6c1baa6 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 2 +#define STK_VERSION_PATCH 3 #define STK_STRINGIFY_HELPER(x) #x #define STK_STRINGIFY(x) STK_STRINGIFY_HELPER(x)