Release 0.3.1

Author: wojciech-graj

.github/workflows/ci.yml

@@ -1,15 +1,51 @@
 name: CI
 
-on:
-  push:
-  pull_request:
+on: [push, pull_request]
 
 jobs:
-  build:
+
+  compile_native:
+    name: Compile (${{ matrix.os }})
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Compile
+        run: make -j$(nproc)
+
+  compile_win:
+    name: Compile (${{ matrix.target }})
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - target: win32
+            apt_pkg: gcc-mingw-w64-i686-win32
+            make_args: PLATFORM=win32
+          - target: win64
+            apt_pkg: gcc-mingw-w64-x86-64-win32
+            make_args: PLATFORM=win64
     steps:
       - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          sudo apt update
+          sudo apt install -y ${{ matrix.apt_pkg }}
       - name: Compile
+        run: make ${{ matrix.make_args }} -j$(nproc)
+
+  compile_appimage:
+    name: Compile (musl, AppImage)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install dependencies
         run: |
-          cd src
-          make -j$(nproc)
+          sudo apt update
+          sudo apt install -y musl-tools
+          wget https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage -O /usr/local/bin/appimagetool
+          chmod +x /usr/local/bin/appimagetool
+      - name: Compile
+        run: make PLATFORM=musl NSIGN=1 -j$(nproc) appimage

Makefile

@@ -2,18 +2,20 @@ ifeq ($(MAKECMDGOALS),release)
 
 .PHONY: release
 release:
-	$(MAKE) PLATFORM=musl appimage-zip
 	$(MAKE) PLATFORM=musl zip
+	$(MAKE) PLATFORM=musl appimage-zip
+	$(MAKE) PLATFORM=musl appimage-release
 	$(MAKE) PLATFORM=win32 zip
 	$(MAKE) PLATFORM=win64 zip
 	mkdir -p release
-	cp -t release _musl/*.zip _win32/*.zip _win64/*.zip
+	cp -t release _musl/*.zip _win32/*.zip _win64/*.zip _musl/*.AppImage
 
 else ifeq ($(MAKECMDGOALS),clean-all)
 
 .PHONY: clean-all
 clean-all:
-	$(MAKE) PLATFORM=linux clean
+	rm -rf release
+	$(MAKE) clean
 	$(MAKE) PLATFORM=musl clean
 	$(MAKE) PLATFORM=win32 clean
 	$(MAKE) PLATFORM=win64 clean
@@ -43,10 +45,14 @@ TARGET = doom-ascii
 CFLAGS += -DNORMALUNIX -DLINUX
 endif
 
-OS = $(shell $(CC) -dumpmachine | cut -d'-' -f1-2)
+TARGET_TRIPLE = $(subst -, ,$(shell $(CC) -dumpmachine))
+ARCH = $(firstword $(TARGET_TRIPLE))
+OS = $(word 2,$(TARGET_TRIPLE))
+
 TARGETAPP = doom-ascii.AppImage
-TARGETZIP = doom-ascii_$(OS)_$(VERSION).zip
-TARGETAPPZIP = doom-ascii_$(OS)_AppImage_$(VERSION).zip
+TARGETAPPREL = doom-ascii-$(VERSION)-$(ARCH).AppImage
+TARGETZIP = doom-ascii-$(VERSION)-$(ARCH)-$(OS).zip
+TARGETAPPZIP = $(TARGETAPPREL).zip
 
 OBJDIR = obj
 APPDIR = $(OBJDIR)/io.github.wojciech_graj.doom_ascii.AppDir
@@ -56,7 +62,10 @@ APPOUTDIR = appimage
 CFLAGS += -O3 -flto -Wall -D_DEFAULT_SOURCE -DVERSION=$(VERSION) -std=c99 #-DSNDSERV -DUSEASM
 LDFLAGS += -flto
 LIBS += -lm
+
+ifndef NSIGN
 APPFLAGS += --sign
+endif
 
 SRC = i_main.c dummy.c am_map.c doomdef.c doomstat.c dstrings.c d_event.c d_items.c d_iwad.c \
 	d_loop.c d_main.c d_mode.c d_net.c f_finale.c f_wipe.c g_game.c hu_lib.c hu_stuff.c info.c \
@@ -78,6 +87,9 @@ all: $(OUTDIR)/$(TARGET) $(OUTDIR)/.default.cfg
 .PHONY: appimage
 appimage: $(APPOUTDIR)/$(TARGETAPP) $(APPOUTDIR)/.default.cfg
 
+.PHONY: appimage-release
+appimage-release: $(TARGETAPPREL)
+
 .PHONY: zip
 zip: $(TARGETZIP)
 
@@ -100,6 +112,9 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.c
 	@mkdir -p $(@D)
 	$(CC) $(CFLAGS) -c $< -o $@
 
+$(TARGETAPPREL): $(OBJDIR)/$(TARGETAPP)
+	cp $< $@
+
 define copy_rule
 $1/%: $2/%
 	@mkdir -p $$(@D)

README.md

@@ -13,19 +13,19 @@ You will need a WAD file (game data). If you don't own the game, the shareware v
 telnet doom.w-graj.net 666
 ```
 
-## Build
+## Usage
 Binaries for Windows and Linux are provided as [github releases](https://github.com/wojciech-graj/doom-ascii/releases).
 
-### Linux / Mac
+### Build from Source
+#### Linux / MacOS
 Requires Make and a C compiler. Creates `_<YOUR OS>/game/doom_ascii`
 ```sh
 make
 ```
 
-### Windows
-Compile on linux. Creates `_<win32|win64>/game/doom_ascii.exe`
+### Other
 ```sh
-make PLATFORM=<win32|win64>
+make PLATFORM=<|unix|musl|win32|win64> <|zip|appimage|appimage-zip|appimage-release|release|clean|clean-all>
 ```
 
 ## Settings

src/AppDir/usr/share/metainfo/io.github.wojciech_graj.doom_ascii.appdata.xml

@@ -10,7 +10,9 @@
 
   <description>
     <p>
-      Text-based DOOM in your terminal!
+      Text-based DOOM in your terminal! A Source-port of doomgeneric. Does not have sound.
+
+      You will need a WAD file (game data). If you don't own the game, the shareware version is freely available.
     </p>
   </description>
 
@@ -30,8 +32,8 @@
 
   <screenshots>
     <screenshot type="default">
-      <image>https://github.com/wojciech-graj/doom-ascii/blob/master/screenshots/logo.png</image>
-      <caption>The title screen</caption>
+      <image>https://w-graj.net/images/doom-ascii/logo.png</image>
+      <caption>The DOOM title screen</caption>
     </screenshot>
   </screenshots>
 

target.mk

@@ -1,7 +1,7 @@
 [].SUFFIXES:
 
 ifndef PLATFORM
-PLATFORM := linux
+PLATFORM := unix
 export PLATFORM
 endif