From 91e23786b4b3d8557bc421ebd8559264d407c7c2 Mon Sep 17 00:00:00 2001
From: MotoLegacy <motolegacy@proton.me>
Date: Sat, 30 Nov 2024 14:18:42 -0800
Subject: [PATCH] Add pipeline for no-SDL2 win32/win64

---
 .github/workflows/build-all-and-release.yml | 54 ++++++++++++++++++++-
 tools/build-nzp-win32-nosdl.sh              |  2 +
 tools/build-nzp-win64-nosdl.sh              |  2 +
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100755 tools/build-nzp-win32-nosdl.sh
 create mode 100755 tools/build-nzp-win64-nosdl.sh

diff --git a/.github/workflows/build-all-and-release.yml b/.github/workflows/build-all-and-release.yml
index b7ab9b1ba..8fdf9362e 100644
--- a/.github/workflows/build-all-and-release.yml
+++ b/.github/workflows/build-all-and-release.yml
@@ -81,6 +81,22 @@ jobs:
         with:
           name: pc-nzp-win32
           path: ./engine/release/nzportable-sdl.exe
+  Compile-Windows32-noSDL2:
+    runs-on: ubuntu-latest
+    container:
+      image: motolegacy/fteqw:latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Build Windows x86 (no SDL)
+        run: |
+          cd tools/
+          sh build-nzp-win32-nosdl.sh
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: pc-nzp-win32-nosdl
+          path: ./engine/release/nzportable.exe
   Compile-Windows64:
     runs-on: ubuntu-latest
     container:
@@ -97,6 +113,22 @@ jobs:
         with:
           name: pc-nzp-win64
           path: ./engine/release/nzportable-sdl64.exe
+  Compile-Windows64-noSDL2:
+    runs-on: ubuntu-latest
+    container:
+      image: motolegacy/fteqw:latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Build Windows x86_64 (no SDL)
+        run: |
+          cd tools/
+          sh build-nzp-win64-nosdl.sh
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: pc-nzp-win64-nosdl
+          path: ./engine/release/nzportable64.exe
   Compile-WASM:
     runs-on: ubuntu-latest
     container:
@@ -117,7 +149,7 @@ jobs:
             ./engine/release/ftewebgl.js
   Unify-and-Release:
     runs-on: ubuntu-latest
-    needs: [Compile-Linux32, Compile-Linux64, Compile-LinuxArm64, Compile-LinuxArmhf, Compile-Windows32, Compile-Windows64, Compile-WASM]
+    needs: [Compile-Linux32, Compile-Linux64, Compile-LinuxArm64, Compile-LinuxArmhf, Compile-Windows32, Compile-Windows32-noSDL2, Compile-Windows64, Compile-Windows64-noSDL2, Compile-WASM]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -136,6 +168,8 @@ jobs:
           zip -r -j pc-nzp-linux_armhf.zip pc-nzp-linux_armhf/*
           zip -r -j pc-nzp-win32.zip pc-nzp-win32/*
           zip -r -j pc-nzp-win64.zip pc-nzp-win64/*
+          zip -r -j pc-nzp-win32-nosdl.zip pc-nzp-win32-nosdl/*
+          zip -r -j pc-nzp-win64-nosdl.zip pc-nzp-win64-nosdl/*
           zip -r -j pc-nzp-web.zip pc-nzp-web/*
       - name: Generate Build Date
         id: date
@@ -208,6 +242,15 @@ jobs:
           asset_path: ./pc-nzp-win32.zip
           asset_name: pc-nzp-win32.zip
           asset_content_type: application/zip
+      - name: Upload Windows32 Archive (no SDL)
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./pc-nzp-win32-nosdl.zip
+          asset_name: pc-nzp-win32-nosdl.zip
+          asset_content_type: application/zip
       - name: Upload Windows64 Archive
         uses: actions/upload-release-asset@v1
         env:
@@ -217,6 +260,15 @@ jobs:
           asset_path: ./pc-nzp-win64.zip
           asset_name: pc-nzp-win64.zip
           asset_content_type: application/zip
+      - name: Upload Windows64 Archive (no SDL)
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./pc-nzp-win64-nosdl.zip
+          asset_name: pc-nzp-win64-nosdl.zip
+          asset_content_type: application/zip
       - name: Upload WASM Archive
         uses: actions/upload-release-asset@v1
         env:
diff --git a/tools/build-nzp-win32-nosdl.sh b/tools/build-nzp-win32-nosdl.sh
new file mode 100755
index 000000000..342a7843f
--- /dev/null
+++ b/tools/build-nzp-win32-nosdl.sh
@@ -0,0 +1,2 @@
+cd ../engine
+make makelibs FTE_TARGET=win32 && make m-rel FTE_TARGET=win32 FTE_CONFIG=nzportable -j32
diff --git a/tools/build-nzp-win64-nosdl.sh b/tools/build-nzp-win64-nosdl.sh
new file mode 100755
index 000000000..9a4ff2105
--- /dev/null
+++ b/tools/build-nzp-win64-nosdl.sh
@@ -0,0 +1,2 @@
+cd ../engine
+make makelibs FTE_TARGET=win64 && make m-rel FTE_TARGET=win64 FTE_CONFIG=nzportable -j32