Rename "web" to "emscripten", simplify the build, add CI

.github/workflows/make.yml

@@ -342,3 +342,38 @@ jobs:
         artifactErrorsFailBuild: true
         prerelease: true
         replacesArtifacts: true
+  make-emscripten:
+    name: Make (Emscripten)
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    defaults:
+      run:
+        shell: bash
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build
+      run: |
+        docker run --rm -v "$(pwd):/src" -e FHEROES2_STRICT_COMPILATION=ON emscripten/emsdk:3.1.74 \
+            sh -c "apt-get -y update && apt-get -y install gettext && emmake make -f Makefile.emscripten -j \"$(nproc)\""
+    - name: Create package
+      run: |
+        # Translations and H2D files are already included in fheroes2.data
+        7z a -bb1 -tzip -- fheroes2_emscripten.zip LICENSE changelog.txt fheroes2.data fheroes2.js fheroes2.wasm ./docs/README.txt ./files/emscripten/*
+    - uses: actions/upload-artifact@v4
+      if: ${{ github.event_name == 'pull_request' }}
+      with:
+        name: fheroes2_emscripten.zip
+        path: fheroes2_emscripten.zip
+        if-no-files-found: error
+    - uses: ncipollo/release-action@v1
+      if: ${{ github.event_name == 'push' }}
+      with:
+        artifacts: fheroes2_emscripten.zip
+        body: ${{ github.event.head_commit.message }}
+        token: ${{ secrets.GITHUB_TOKEN }}
+        name: Emscripten build (latest commit)
+        tag: fheroes2-emscripten-sdl2_dev
+        allowUpdates: true
+        artifactErrorsFailBuild: true
+        prerelease: true
+        replacesArtifacts: true

Makefile.web → Makefile.emscripten

@@ -24,14 +24,20 @@
 # FHEROES2_WITH_DEBUG: build in debug mode
 # FHEROES2_DATA: set the built-in path to the fheroes2 data directory (e.g. /usr/share/fheroes2)
 
-PROJECT_NAME := fheroes2
-PROJECT_VERSION := $(file < version.txt)
+.PHONY: all clean translations
 
-.PHONY: all clean
+all: fheroes2.js
 
-all:
-	$(MAKE) -C src/dist PLATFORM=web
+fheroes2.js: translations
+	$(MAKE) -C src/dist PLATFORM=emscripten
+	cp src/dist/fheroes2-ems/fheroes2.data .
+	cp src/dist/fheroes2-ems/fheroes2.js .
+	cp src/dist/fheroes2-ems/fheroes2.wasm .
+
+translations:
+	$(MAKE) -C files/lang
 
 clean:
-	$(MAKE) -C src/dist PLATFORM=web clean
+	$(MAKE) -C src/dist clean
 	$(MAKE) -C files/lang clean
+	rm -f fheroes2.data fheroes2.js fheroes2.wasm

Makefile.vita

@@ -1,6 +1,6 @@
 ###########################################################################
 #   fheroes2: https://github.com/ihhub/fheroes2                           #
-#   Copyright (C) 2021 - 2024                                             #
+#   Copyright (C) 2021 - 2025                                             #
 #                                                                         #
 #   This program is free software; you can redistribute it and/or modify  #
 #   it under the terms of the GNU General Public License as published by  #
@@ -40,7 +40,7 @@ fheroes2.vpk: eboot.bin param.sfo translations
 		--add files/images/platform/psv/sce_sys/livearea/contents/template.xml=sce_sys/livearea/contents/template.xml \
 		--add files/data=files/data \
 		--add files/lang/vita_temp=files/lang \
-	fheroes2.vpk
+		fheroes2.vpk
 	rm -r files/lang/vita_temp
 
 translations: fheroes2.elf

src/dist/Makefile

@@ -159,8 +159,8 @@ ifndef FHEROES2_WITH_SYSTEM_SMACKER
 	$(MAKE) -C thirdparty/libsmacker CCFLAGS="$(CCFLAGS_TP)" CFLAGS="$(CFLAGS_TP)" CXXFLAGS="$(CXXFLAGS_TP)" CPPFLAGS="$(CPPFLAGS_TP)"
 endif
 	$(MAKE) -C engine
-ifeq ($(PLATFORM),web)
-	$(MAKE) -C web
+ifeq ($(PLATFORM),emscripten)
+	$(MAKE) -C fheroes2-ems
 else
 	$(MAKE) -C fheroes2
 endif
@@ -173,8 +173,8 @@ ifndef FHEROES2_WITH_SYSTEM_SMACKER
 	$(MAKE) -C thirdparty/libsmacker clean
 endif
 	$(MAKE) -C engine clean
-ifeq ($(PLATFORM),web)
-	$(MAKE) -C web clean
+ifeq ($(PLATFORM),emscripten)
+	$(MAKE) -C fheroes2-ems clean
 else
 	$(MAKE) -C fheroes2 clean
 endif

src/dist/Makefile.web → src/dist/Makefile.emscripten

@@ -18,20 +18,22 @@
 #   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             #
 ###########################################################################
 
-CCFLAGS := $(filter-out -pthread,$(CCFLAGS)) --use-port=sdl2_mixer \
+CCFLAGS := $(filter-out -pthread,$(CCFLAGS)) \
 	--use-port=sdl2 \
-	--use-port=zlib
+	--use-port=sdl2_mixer \
+	--use-port=zlib \
+	-Wno-variadic-macro-arguments-omitted
 
-LDFLAGS := $(filter-out -pthread,$(LDFLAGS)) -sENVIRONMENT=web \
+LDFLAGS := $(filter-out -pthread,$(LDFLAGS)) \
 	--preload-file ../../../files/data/resurrection.h2d@/files/data/resurrection.h2d \
 	--preload-file ../../../files/lang/@/files/lang/ \
 	--preload-file ../../../files/soundfonts/fheroes2.sf3@/files/soundfonts/fheroes2.sf3 \
-	-sNO_DISABLE_EXCEPTION_CATCHING \
-	-sSTACK_SIZE=262144 \
-	-sINITIAL_MEMORY=128mb \
-	-sENVIRONMENT=web \
 	-sASYNCIFY \
 	-sASYNCIFY_STACK_SIZE=20480 \
+	-sENVIRONMENT=web \
+	-sINITIAL_MEMORY=128mb \
+	-sNO_DISABLE_EXCEPTION_CATCHING \
+	-sSTACK_SIZE=262144 \
 	-lidbfs.js
 
 ifdef FHEROES2_WITH_DEBUG

src/dist/web/Makefile → src/dist/fheroes2-ems/Makefile

@@ -37,19 +37,12 @@ VPATH := $(SOURCEDIRS)
 all: fheroes2.js
 
 fheroes2.js: $(notdir $(patsubst %.cpp, %.o, $(SOURCES))) $(DEPLIBS)
-	xgettext -d fheroes2.js --language=JavaScript -F -k_ -k_n:1,2 -o fheroes2.pot $(sort $(SOURCES))
-	$(MAKE) -C ../../../files/lang
 	$(CXX) -o $@ $^ $(LIBS) $(LDFLAGS)
-	rm -f *.d *.o *.tmp *.pot~ *.pot
-	mkdir -p dist
-	mv -f fheroes2.* dist
-	cp ../../../files/web/dist/* dist
 
 %.o: %.cpp
 	$(CXX) -c -MD $< $(addprefix -I, $(SOURCEDIRS)) $(CCFLAGS) $(CXXFLAGS) $(CPPFLAGS)
 
 include $(wildcard *.d)
 
 clean:
-	rm -f *.d *.o fheroes2.js fheroes2.wasm fheroes2.wasm.* fheroes2.data fheroes2.pot fheroes2.pot~
-	rm -rf dist
+	rm -f *.d *.o fheroes2.data fheroes2.js fheroes2.wasm