Merge branch 'master' of github.com:instead-hub/instead

.github/workflows/CI.yml

@@ -28,7 +28,7 @@ jobs:
           }
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@main
 
       - name: Create Build Directory
         run: cmake -E make_directory ${{github.workspace}}/build
@@ -50,7 +50,7 @@ jobs:
 #          cmake --install ./build
 
 #      - name: Publish Artifact
-#        uses: actions/upload-artifact@v2
+#        uses: actions/upload-artifact@v4
 #        with:
 #          name: standalone
 #          path: build/standalone

.github/workflows/appimage.yml

@@ -9,7 +9,7 @@ jobs:
     name: build AppImage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@main
 
       - name: Create Build Directory
         run: cmake -E make_directory ${{github.workspace}}/build
@@ -39,7 +39,7 @@ jobs:
           ./appimagetool-x86_64.AppImage appimage/
 
       - name: Publish Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: AppImage
           path: INSTEAD-x86_64.AppImage

.github/workflows/emscripten.yml

@@ -5,18 +5,18 @@ on:
   workflow_dispatch:
 
 env:
-    emsdk_ver: 3.1.19
+    emsdk_ver: 3.1.49
 
 jobs:
   build:
     name: Emscripten version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@main
 
       - name: Cache emsdk
         id: cache-emsdk
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: emsdk
           key: ${{ runner.os }}-${{ env.emsdk_ver }}
@@ -51,7 +51,7 @@ jobs:
           cp env/instead-em-js/*.svg ../release/instead-em
 
       - name: Publish Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: instead-em
           path: release

.github/workflows/windows.yml

@@ -10,7 +10,7 @@ jobs:
     name: Windows version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@main
 
       - name: Install Packages
         run: |
@@ -31,7 +31,7 @@ jobs:
         run: make install -f Makefile.mingw
 
       - name: Publish Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: instead-win
           path: bin

CMakeLists.txt

@@ -8,7 +8,7 @@ IF("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
 ENDIF("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
 
 # global constants
-SET(INSTEAD_VERSION "3.5.1")
+SET(INSTEAD_VERSION "3.5.2")
 
 # options
 OPTION(WITH_GTK2 "Use GTK2 file open dialog" OFF)

ChangeLog

@@ -1,11 +1,24 @@
+3.5.2
+
+ * enh: redesigned installer for Windows;
+ * enh: gamepad triggers simulate mouse wheel up/down;
+ * fix: theme.reset();
+ * fix: documentation.
+
+ -- Peter Kosyh <[email protected]>  Sun, 1 Sep 2024 12:00:00 +0300
+
 3.5.1
 
  * enh: gamepads support;
  * fix: anigif logic;
  * fix: sprite alpha artefacts;
- * fix: cleanups in instead library and docs.
+ * fix: cleanups in instead library and docs;
+ * fix: Windows XP build;
+ * fix: -software parameter in Windows;
+ * fix: dbg keyboard input fix;
+ * fix: segfault in pixels (line).
 
- -- Peter Kosyh <[email protected]>  Mon, 27 Mar 2023 21:48:00 +0300
+ -- Peter Kosyh <[email protected]>  Fri, 1 Sep 2023 12:00:00 +0300
 
 3.5.0
 

INSTALL

@@ -1,4 +1,4 @@
-INSTEAD 3.5.1
+INSTEAD 3.5.2
 =============
 
 WARNING! For successfull building you must install these development packages

Makefile

@@ -34,7 +34,8 @@ PKGBUILD: PKGBUILD.in tarball
 	cat PKGBUILD.in | sed -e s/MD5SUM/`md5sum $(ARCHIVE) | cut -f1 -d' '`/g > PKGBUILD
 
 windows-sdl2.tar.gz:
-	wget "http://sourceforge.net/projects/instead/files/instead/build-bin-data/windows-sdl2-2.0.24.tar.gz/download" -O $(@)
+	wget "http://sourceforge.net/projects/instead/files/instead/build-bin-data/windows-sdl2-2.0.24.2.tar.gz/download" -O $(@)
+	# wget "http://sourceforge.net/projects/instead/files/instead/build-bin-data/windows-sdl2-2.0.24.tar.gz/download" -O $(@)
 	# wget "http://sourceforge.net/projects/instead/files/instead/build-bin-data/windows-sdl2-2.0.22.tar.gz/download" -O $(@)
 	# wget "http://sourceforge.net/projects/instead/files/instead/build-bin-data/windows-sdl2-2.0.14.tar.gz/download" -O $(@)
 

Makefile.mingw

@@ -24,6 +24,7 @@ docs:
 
 install: all
 	cp src/sdl-instead.exe bin
+	cp COPYING bin
 	$(MAKE) DESTDIR=../bin/ -C themes install
 	$(MAKE) DESTDIR=../bin/ -C games install
 	$(MAKE) DESTDIR=../bin/ -C stead install

PKGBUILD.in

@@ -1,7 +1,7 @@
 # Contributor: Peter Kosyh <p.kosyhgmail.com>
 
 pkgname=instead
-pkgver=3.5.1
+pkgver=3.5.2
 pkgrel=1
 pkgdesc="instead quest interpreter"
 arch=('i686' 'x86_64')

Rules.make.macosx

@@ -1,4 +1,4 @@
-VERSION := 3.5.1
+VERSION := 3.5.2
 
 DESTDIR=
 BIN=

Rules.make.standalone

@@ -1,4 +1,4 @@
-VERSION := 3.5.1
+VERSION := 3.5.2
 
 DESTDIR=
 BIN=

Rules.make.system

@@ -1,4 +1,4 @@
-VERSION := 3.5.1
+VERSION := 3.5.2
 
 PREFIX=/usr/local
 DESTDIR=

Rules.mingw

@@ -1,4 +1,4 @@
-VERSION := 3.5.1
+VERSION := 3.5.2
 
 PREFIX=./
 DESTDIR=

contrib/instead-em-build.sh

@@ -44,7 +44,7 @@ deps()
 cd $WORKSPACE
 if ! test -r .stamp_lua; then
 rm -rf lua-5.1.5
-[ -f lua-5.1.5.tar.gz ] || wget -nv 'https://www.lua.org/ftp/lua-5.1.5.tar.gz'
+[ -f lua-5.1.5.tar.gz ] || wget -nv 'https://www.lua.org/ftp/lua-5.1.5.tar.gz' || wget -nv 'https://www.tecgraf.puc-rio.br/lua/mirror/ftp/lua-5.1.5.tar.gz'
 tar xf lua-5.1.5.tar.gz
 cd lua-5.1.5
 cat src/luaconf.h | sed -e 's/#define LUA_USE_POPEN//g' -e 's/#define LUA_USE_ULONGJMP//g'>src/luaconf.h.new
@@ -69,10 +69,10 @@ fi
 # zlib
 cd $WORKSPACE
 if ! test -r .stamp_zlib; then
-rm -rf zlib-1.2.13/
-[ -f zlib-1.2.13.tar.gz ] || wget -nv 'http://zlib.net/zlib-1.2.13.tar.gz'
-tar xf zlib-1.2.13.tar.gz
-cd zlib-1.2.13
+rm -rf zlib-1.3.1/
+[ -f zlib-1.3.1.tar.gz ] || wget -nv 'http://zlib.net/zlib-1.3.1.tar.gz'
+tar xf zlib-1.3.1.tar.gz
+cd zlib-1.3.1
 emconfigure ./configure --prefix=$WORKSPACE
 emmake make install
 touch ../.stamp_zlib
@@ -148,32 +148,6 @@ emmake make install
 touch ../.stamp_sdl2_mixer
 fi
 
-# jpeg lib
-cd $WORKSPACE
-if ! test -r .stamp_jpeg; then
-rm -rf jpeg-9b
-[ -f jpegsrc.v9b.tar.gz ] || wget -nv 'http://www.ijg.org/files/jpegsrc.v9b.tar.gz'
-tar xf jpegsrc.v9b.tar.gz
-cd jpeg-9b
-emconfigure ./configure --prefix=$WORKSPACE --disable-shared
-emmake make install
-touch ../.stamp_jpeg
-fi
-
-# SDL_image
-cd $WORKSPACE
-if ! test -r .stamp_sdl2_image; then
-rm -rf SDL2_image
-[ -d SDL2_image/.git ] || git clone https://github.com/emscripten-ports/SDL2_image.git SDL2_image
-cd SDL2_image
-./autogen.sh
-export ac_cv_lib_jpeg_jpeg_CreateDecompress=yes
-export ac_cv_lib_png_png_create_read_struct=yes
-emconfigure ./configure --host=asmjs-unknown-linux --prefix=$WORKSPACE CPPFLAGS="-I$WORKSPACE/include -I$WORKSPACE/include/SDL2 -s USE_LIBPNG=1" LDFLAGS="-L$WORKSPACE/lib -lpng -ljpeg" --disable-sdltest --disable-shared --enable-static --enable-png --disable-png-shared --enable-jpg --disable-jpg-shared CFLAGS="-sUSE_SDL=2"
-emmake make install
-touch ../.stamp_sdl2_image
-fi
-
 }
 
 deps
@@ -188,7 +162,7 @@ git pull
 [ -e Rules.make ] || ln -s Rules.standalone Rules.make
 cat <<EOF > config.make
 EXTRA_CFLAGS+= -DNOMAIN -D_HAVE_ICONV -I../../include
-SDL_CFLAGS=-I../../include/SDL2 -sUSE_SDL=2
+SDL_CFLAGS=-I../../include/SDL2 -sUSE_SDL=2 -sUSE_SDL_IMAGE=2
 SDL_LFLAGS=
 LUA_CFLAGS=
 LUA_LFLAGS=
@@ -282,16 +256,17 @@ cd instead-em-js
 ln -f -s ../instead-em/src/sdl-instead.bc sdl-instead.bc
 ln -f -s ../lib lib
 
-emcc -O2 sdl-instead.bc lib/libz.a lib/libiconv.so lib/liblua.a lib/libSDL2_ttf.a  lib/libfreetype.a lib/libSDL2_mixer.a lib/libmikmod.a  lib/libSDL2_image.a lib/libjpeg.a  \
+emcc -O2 sdl-instead.bc lib/libz.a lib/libiconv.so lib/liblua.a lib/libSDL2_ttf.a  lib/libfreetype.a lib/libSDL2_mixer.a lib/libmikmod.a \
 -lidbfs.js \
 -s EXPORTED_FUNCTIONS="['_instead_main']" \
--s 'SDL2_IMAGE_FORMATS=["png","jpeg","gif"]' \
+-s 'SDL2_IMAGE_FORMATS=["png","jpg","gif"]' \
 -s 'EXPORTED_RUNTIME_METHODS=["ccall", "Pointer_stringify"]' \
 -s 'DEFAULT_LIBRARY_FUNCS_TO_INCLUDE=["$autoResumeAudioContext", "$dynCall"]' \
 -s QUANTUM_SIZE=4 \
 -s WASM=1 \
 -s PRECISE_F32=1 \
--s USE_OGG=1 -s USE_VORBIS=1 -s USE_LIBPNG=1 -s USE_SDL=2 \
+-s STACK_SIZE=131072 \
+-s USE_OGG=1 -s USE_VORBIS=1 -s USE_SDL=2 -s USE_SDL_IMAGE=2 \
 -o instead-em.html -s SAFE_HEAP=0  -s TOTAL_MEMORY=167772160 -s ALLOW_MEMORY_GROWTH=1 \
 --post-js post.js  \
 --preload-file fs@/

contrib/instead-sailfish.spec

@@ -1,6 +1,6 @@
 Summary:	simple text adventures/visual novels engine and game
 Name:		instead
-Version:	3.5.0
+Version:	3.5.2
 Release:	1%{?dist}
 License:	MIT
 URL:		http://instead.sourceforge.net