[fuse-emulator-cvs] [fuse] branch master updated: feat: Added build definition for SDL 1 UI + Sound on Windows

[<sba...@us...>]

This is an automated email from the git hooks/post-receive-user script.

sbaldovi pushed a commit to branch master
in repository fuse.

View the commit online:
https://sourceforge.net/p/fuse-emulator/fuse/ci/93c6cd556f374f75fce3d97b196a2274d1b513da/

The following commit(s) were added to refs/heads/master by this push:
     new 93c6cd55 feat: Added build definition for SDL 1 UI + Sound on Windows
     new e3abbdff Merge request #23: Add GitHub workflow for SDL 1 UI + sound
93c6cd55 is described below

commit 93c6cd556f374f75fce3d97b196a2274d1b513da
Author: Miroslav Ďurčík <743...@us...>
AuthorDate: Tue May 16 21:55:03 2023 +0200

    feat: Added build definition for SDL 1 UI + Sound on Windows
    
    
    Modified GitHub build workflow files for Windows and so introduced configuration with SDL UI (widget) + SDL Sound
    Small fixes within the sub workflow file.
    
    https://sourceforge.net/p/arki55-fuse-mod/tickets/12/
---
 .github/workflows/build_windows.yml     | 13 +++++++++++++
 .github/workflows/build_windows_sub.yml |  6 +++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 7d9c00c4..3a03777b 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -65,3 +65,16 @@ jobs:
       verify_ui: "win32"
       verify_libxml2: "no"
       verify_audio: "null"
+
+  # SDL 1 UI + Sound
+  sdl-ui-sdl-sound:
+    name: "Fuse SDL 1 UI + sound (Windows)"
+    needs: [libspectrum]
+    uses: ./.github/workflows/build_windows_sub.yml
+    with:
+      dependencies: "mingw64-i686-SDL"
+      configure_params: "--without-win32 --with-sdl --disable-sdl2 --with-audio-driver=sdl"
+      verify_ui: "sdl"
+      verify_libxml2: "no"
+      verify_audio: "sdl"
+      verify_other: "Using SDL 2: no"
diff --git a/.github/workflows/build_windows_sub.yml b/.github/workflows/build_windows_sub.yml
index 7859aa5a..2b476082 100644
--- a/.github/workflows/build_windows_sub.yml
+++ b/.github/workflows/build_windows_sub.yml
@@ -41,6 +41,8 @@ jobs:
       CPPFLAGS: "-I/usr/local/i686-w64-mingw32/include"
       LDFLAGS: "-L/usr/local/i686-w64-mingw32/lib"
       PKG_CONFIG_LIBDIR: "/usr/local/i686-w64-mingw32/lib/pkgconfig:/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig"    
+      # In case of SDL
+      SDL_CONFIG: "/usr/i686-w64-mingw32/sys-root/mingw/bin/sdl-config"
     steps:
       - name: (1) Prepare environment
         run: |
@@ -139,8 +141,10 @@ jobs:
         shell: C:\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'
       - if: ${{ inputs.verify_other }}
         run: |
+          cd ${GITHUB_WORKSPACE}
+          
           .github/scripts/in_config.sh "${{ inputs.verify_other }}"
-        shell: bash
+        shell: C:\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'
 
       - name: (9) Make
         run: |