diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 33c896e..491ce19 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -33,6 +33,9 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v5 + - name: Set SDL2 default + run: | + sed -i 's/WITH_SDL3:=yes/WITH_SDL3:=no/g' Makefile - name: Initialize CodeQL uses: github/codeql-action/init@v3 with: diff --git a/.github/workflows/linux_aarch64.yml b/.github/workflows/linux_aarch64.yml index e54ab58..70d4c4c 100644 --- a/.github/workflows/linux_aarch64.yml +++ b/.github/workflows/linux_aarch64.yml @@ -35,7 +35,7 @@ jobs: - name: Build run: | # Public runners come with 4 CPUs. - make -j4 + make WITH_SDL3=no -j4 - name: Create testbuild package run: | # Create release directory tree diff --git a/.github/workflows/linux_x86_64.yml b/.github/workflows/linux_x86_64.yml index bf14ee8..3901cc9 100644 --- a/.github/workflows/linux_x86_64.yml +++ b/.github/workflows/linux_x86_64.yml @@ -28,8 +28,13 @@ jobs: - name: Install build dependencies run: | sudo apt update - sudo apt install libgl1-mesa-dev libsdl2-dev libopenal-dev libcurl4-openssl-dev \ + sudo apt install libgl1-mesa-dev libopenal-dev libcurl4-openssl-dev \ libavformat-dev libswscale-dev libvulkan-dev build-essential + - name: Build SDL3 + uses: libsdl-org/setup-sdl@main + with: + install-linux-dependencies: true + version: 3-latest - name: Check out repository code uses: actions/checkout@v5 - name: Build diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 3765ef0..ba23f6b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -28,7 +28,7 @@ jobs: - name: Install build dependencies run: | brew update - brew install sdl2 openal-soft make molten-vk + brew install sdl3 openal-soft make molten-vk - name: Check out repository code uses: actions/checkout@v5 - name: Build diff --git a/.github/workflows/win32.yml b/.github/workflows/win32.yml index f2003ba..1373485 100644 --- a/.github/workflows/win32.yml +++ b/.github/workflows/win32.yml @@ -38,15 +38,19 @@ jobs: unzip mingw-w64-${{matrix.env}}-gcc mingw-w64-${{matrix.env}}-make - mingw-w64-${{matrix.env}}-SDL2 mingw-w64-${{matrix.env}}-vulkan-headers + mingw-w64-${{matrix.env}}-pkgconf - name: Check out repository code uses: actions/checkout@v5 - name: Build shell: msys2 {0} run: | + # Download and extract SDL3 devel files. + wget -c https://github.com/libsdl-org/SDL/releases/download/release-3.2.24/SDL3-devel-3.2.24-mingw.tar.gz + tar xf SDL3-devel-3.2.24-mingw.tar.gz + mv SDL3-3.2.24 SDL3 # Public runners come with 4 CPUs. - make -j4 + PKG_CONFIG_PATH=SDL3/i686-w64-mingw32/lib/pkgconfig make -j4 - name: Create testbuild package shell: msys2 {0} run: | diff --git a/.github/workflows/win64.yml b/.github/workflows/win64.yml index 1523521..7dd0393 100644 --- a/.github/workflows/win64.yml +++ b/.github/workflows/win64.yml @@ -44,9 +44,12 @@ jobs: - name: Build shell: msys2 {0} run: | - sed -i 's|WITH_SDL3:=no|WITH_SDL3:=yes|g' Makefile + # Download and extract SDL3 devel files. + wget -c https://github.com/libsdl-org/SDL/releases/download/release-3.2.24/SDL3-devel-3.2.24-mingw.tar.gz + tar xf SDL3-devel-3.2.24-mingw.tar.gz + mv SDL3-3.2.24 SDL3 # Public runners come with 4 CPUs. - make -j4 + PKG_CONFIG_PATH=SDL3/i686-w64-mingw32/lib/pkgconfig make -j4 - name: Create testbuild package shell: msys2 {0} run: | diff --git a/Makefile b/Makefile index 0a15b62..621a549 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # - Vulkan renderer lib (ref_vk.so / rev_vk.dll) # # # # Dependencies: # -# - SDL2 # +# - SDL3 # # - Vulkan headers # # # # Platforms: # @@ -20,7 +20,7 @@ # ------------------------- # Builds with SDL 3 instead of SDL 2. -WITH_SDL3:=no +WITH_SDL3:=yes # ----------