Install SDL3 instead of SDL2 on Linux

jhasse · Dec 18, 2024 · d493653 · d493653
1 parent 5f0e37a
commit d493653
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -102,11 +102,11 @@ jobs:
       image: registry.fedoraproject.org/fedora-minimal:40
     steps:
     - name: Install dependencies
-      run: microdnf install -y cmake ninja-build mingw64-pkg-config mingw64-libvorbis mingw64-SDL2 mingw64-fontconfig mingw64-libwebp mingw64-dlfcn mingw32-nsis mingw64-gcc-c++ tar gzip
+      run: microdnf install -y cmake ninja-build mingw64-pkg-config mingw64-libvorbis mingw64-SDL3 mingw64-fontconfig mingw64-libwebp mingw64-dlfcn mingw32-nsis mingw64-gcc-c++ tar gzip
     - uses: actions/checkout@v4
     - name: Build with CMake and GCC
       run: |
-        mingw64-cmake -Bbuild-windows -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=0 -DJNGL_SDL2=1
+        mingw64-cmake -Bbuild-windows -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=0 -DJNGL_SDL3=1
         cmake --build build-windows
 
 env:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ image: registry.fedoraproject.org/fedora-minimal:40
 linux:
   stage: build
   script:
-  - microdnf install -y cmake ninja-build gcc-c++ fontconfig-devel freetype-devel libvorbis-devel libwebp-devel SDL2-devel libtheora-devel clang util-linux clang-tools-extra >/dev/null
+  - microdnf install -y cmake ninja-build gcc-c++ fontconfig-devel freetype-devel libvorbis-devel libwebp-devel SDL3-devel libtheora-devel clang util-linux clang-tools-extra >/dev/null
   - .github/ci.py
   - CXXFLAGS=-fdiagnostics-color cmake -Bbuild -GNinja
   - cd build
@@ -28,7 +28,7 @@ linux:
 mingw:
   stage: build
   script:
-    - microdnf install -y cmake ninja-build mingw64-pkg-config mingw64-libvorbis mingw64-SDL2 mingw64-fontconfig mingw64-libwebp mingw64-dlfcn mingw64-gcc-c++ > /dev/null
+    - microdnf install -y cmake ninja-build mingw64-pkg-config mingw64-libvorbis mingw64-SDL3 mingw64-fontconfig mingw64-libwebp mingw64-dlfcn mingw64-gcc-c++ > /dev/null
     - mingw64-cmake -GNinja -Bbuild-debug -DCMAKE_BUILD_TYPE=Debug
     - ninja -C build-debug
     - mingw64-cmake -GNinja -Bbuild-release -DCMAKE_BUILD_TYPE=Release

diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ libxxf86vm-dev libvorbis-dev cmake g++ libwebp-dev git libsdl2-dev
 
 ```
 sudo dnf install fontconfig-devel freetype-devel libvorbis-devel libwebp-devel \
-cmake SDL2-devel gcc-c++ libatomic
+cmake SDL3-devel gcc-c++ libatomic
 ```
 
 ### Arch Linux
@@ -52,7 +52,7 @@ Set up [MSYS2](https://www.msys2.org/) and install the following in a MinGW-w64
 pacman -Syu --needed mingw-w64-x86_64-gcc \
 mingw-w64-x86_64-freetype mingw-w64-x86_64-libvorbis mingw-w64-x86_64-libwebp \
 mingw-w64-x86_64-dlfcn mingw-w64-x86_64-cmake make mingw-w64-x86_64-gdb \
-mingw-w64-x86_64-libtheora mingw-w64-x86_64-SDL2
+mingw-w64-x86_64-libtheora mingw-w64-x86_64-SDL3
 ```
 
 ### Visual Studio 2017 or newer