#1490: fixed export game for win7

nesbox · Jul 20, 2021 · 4fdbdec · 4fdbdec
1 parent 5e1f93a
commit 4fdbdec
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
       shell: cmd
       run: |
         cd build
-        cmake -G "Visual Studio 16 2019" -A Win32 -T v141_xp -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
+        cmake -G "Visual Studio 16 2019" -A Win32 -T v141_xp -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DBUILD_STUB=On ..
         cmake --build . --config %BUILD_TYPE% --parallel
 
     - name: Deploy
@@ -30,6 +30,12 @@ jobs:
         name: 'tic80-winxp-sdl'
         path: build/bin/tic80.exe
 
+    - name: Deploy stubs
+      uses: actions/upload-artifact@v2
+      with:
+        name: 'tic80-winxp-sdl-stub'
+        path: build/bin/tic80*.exe
+
 # === Windows SDL2 ===
   windows-sdl:
     runs-on: windows-latest
@@ -493,10 +499,16 @@ jobs:
 
 # === Export ===
   export:
-    needs: [windows-sdl, linux-sdl, rpi, macos-sdl, wasm]
+    needs: [winxp-sdl, windows-sdl, linux-sdl, rpi, macos-sdl, wasm]
     runs-on: ubuntu-latest
 
     steps:
+      - name: Download Windows XP artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: tic80-winxp-sdl
+          path: winxpdir
+
       - name: Download Windows artifact
         uses: actions/download-artifact@v2
         with:
@@ -528,6 +540,7 @@ jobs:
 
       - name: Rename
         run: |
+          cp winxpdir/* winxp
           cp windir/* win
           cp linuxdir/* linux
           cp macdir/* mac
@@ -540,6 +553,7 @@ jobs:
         with:
           name: 'tic80-export'
           path: |
+            winxp
             win
             linux
             mac
@@ -555,6 +569,12 @@ jobs:
         script: [lua, moon, fennel, js, wren, squirrel]
 
     steps:
+      - name: Download Windows XP artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: tic80-winxp-sdl-stub
+          path: winxpdir
+
       - name: Download Windows artifact
         uses: actions/download-artifact@v2
         with:
@@ -586,6 +606,7 @@ jobs:
 
       - name: Rename
         run: |
+          cp winxpdir/tic80${{ matrix.script }}.exe winxp${{ matrix.script }}
           cp windir/tic80${{ matrix.script }}.exe win${{ matrix.script }}
           cp linuxdir/tic80${{ matrix.script }} linux${{ matrix.script }}
           cp rpidir/tic80${{ matrix.script }} rpi${{ matrix.script }}
@@ -599,6 +620,7 @@ jobs:
         with:
           name: 'tic80-export'
           path: |
+            winxp${{ matrix.script }}
             win${{ matrix.script }}
             linux${{ matrix.script }}
             rpi${{ matrix.script }}
@@ -617,6 +639,7 @@ jobs:
           name: |
             tic80-rpi
             tic80-macos-sdl
+            tic80-winxp-sdl-stub
             tic80-windows-sdl-stub
             tic80-linux-sdl-stub
             tic80-rpi-stub

diff --git a/src/studio/screens/console.c b/src/studio/screens/console.c
@@ -97,6 +97,7 @@
 
 #define EXPORT_CMD_LIST(macro)  \
     macro(win)                  \
+    macro(winxp)                \
     macro(linux)                \
     macro(rpi)                  \
     macro(mac)                  \
@@ -1969,6 +1970,11 @@ static void onExport_win(Console* console, const char* param, const char* filena
     exportNativeGame(console, getFilename(filename, ".exe"), param, params);
 }
 
+static void onExport_winxp(Console* console, const char* param, const char* filename, ExportParams params)
+{
+    exportNativeGame(console, getFilename(filename, ".exe"), param, params);
+}
+
 static void onExport_linux(Console* console, const char* param, const char* filename, ExportParams params)
 {
     exportNativeGame(console, filename, param, params);