Migrate to SDL3/OGL3

Author: drhelius

.github/workflows/codeql.yml

@@ -39,7 +39,20 @@ jobs:
       run: sudo apt-get update -qq
 
     - name: Install dependencies
-      run: sudo apt-get install -y libsdl2-dev libgtk-3-dev
+      run: |
+        sudo apt-get install -y build-essential cmake libgtk-3-dev \
+        libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev \
+        libxi-dev libxss-dev libxkbcommon-dev libwayland-dev libdecor-0-dev \
+        libdrm-dev libgbm-dev libgl1-mesa-dev libegl1-mesa-dev libdbus-1-dev libudev-dev
+
+    - name: Build and install SDL3
+      run: |
+        SDL3_TAG=$(curl -s https://api.github.com/repos/libsdl-org/SDL/releases/latest | jq -r '.tag_name')
+        echo "Building SDL3 $SDL3_TAG"
+        git clone --depth 1 --branch "$SDL3_TAG" https://github.com/libsdl-org/SDL.git /tmp/SDL3
+        cmake -S /tmp/SDL3 -B /tmp/SDL3/build -DCMAKE_INSTALL_PREFIX=/usr -DSDL_TESTS=OFF -DSDL_EXAMPLES=OFF
+        cmake --build /tmp/SDL3/build -j$(nproc)
+        sudo cmake --install /tmp/SDL3/build
 
     - name: Get build number
       run: |

.github/workflows/geargrafx.yml

@@ -41,7 +41,15 @@ jobs:
     - name: Update OS
       run: sudo apt-get update -qq
     - name: Install dependencies
-      run: sudo apt-get install -y libsdl2-dev libgtk-3-dev
+      run: sudo apt-get install -y build-essential cmake libgtk-3-dev
+    - name: Build and install SDL3
+      run: |
+        SDL3_TAG=$(curl -s https://api.github.com/repos/libsdl-org/SDL/releases/latest | jq -r '.tag_name')
+        echo "Building SDL3 $SDL3_TAG"
+        git clone --depth 1 --branch "$SDL3_TAG" https://github.com/libsdl-org/SDL.git /tmp/SDL3
+        cmake -S /tmp/SDL3 -B /tmp/SDL3/build -DCMAKE_INSTALL_PREFIX=/usr -DSDL_TESTS=OFF -DSDL_EXAMPLES=OFF
+        cmake --build /tmp/SDL3/build -j$(nproc)
+        sudo cmake --install /tmp/SDL3/build
     - name: Get build number
       run: |
         echo "BUILD_NUMBER=$(git describe --abbrev=7 --dirty --always --tags)" >> $GITHUB_ENV
@@ -73,7 +81,15 @@ jobs:
     - name: Update OS
       run: sudo apt-get update -qq
     - name: Install dependencies
-      run: sudo apt-get install -y libsdl2-dev libgtk-3-dev
+      run: sudo apt-get install -y build-essential cmake libgtk-3-dev
+    - name: Build and install SDL3
+      run: |
+        SDL3_TAG=$(curl -s https://api.github.com/repos/libsdl-org/SDL/releases/latest | jq -r '.tag_name')
+        echo "Building SDL3 $SDL3_TAG"
+        git clone --depth 1 --branch "$SDL3_TAG" https://github.com/libsdl-org/SDL.git /tmp/SDL3
+        cmake -S /tmp/SDL3 -B /tmp/SDL3/build -DCMAKE_INSTALL_PREFIX=/usr -DSDL_TESTS=OFF -DSDL_EXAMPLES=OFF
+        cmake --build /tmp/SDL3/build -j$(nproc)
+        sudo cmake --install /tmp/SDL3/build
     - name: Get build number
       run: |
         echo "BUILD_NUMBER=$(git describe --abbrev=7 --dirty --always --tags)" >> $GITHUB_ENV
@@ -124,7 +140,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Install dependencies
-      run: brew install sdl2
+      run: brew install sdl3
     - name: Get build number
       run: |
         echo "BUILD_NUMBER=$(git describe --abbrev=7 --dirty --always --tags)" >> $GITHUB_ENV
@@ -147,6 +163,7 @@ jobs:
         security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
         security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
 
+        codesign -v -f -o runtime --sign "$MACOS_CERTIFICATE_NAME" ${{ env.NAME_UPPER }}.app/Contents/Frameworks/libSDL3.0.dylib
         codesign -v -f -o runtime --entitlements "app.entitlements" --sign "$MACOS_CERTIFICATE_NAME" ${{ env.NAME_UPPER }}.app/Contents/MacOS/${{ env.NAME_LOWER }}
         codesign -v -f -o runtime --sign "$MACOS_CERTIFICATE_NAME" ${{ env.NAME_UPPER }}.app
 
@@ -231,7 +248,7 @@ jobs:
       uses: vmactions/freebsd-vm@v1
       with:
         usesh: true
-        prepare: pkg install -y git gmake pkgconf sdl2 lang/gcc gtk3
+        prepare: pkg install -y git gmake pkgconf sdl3 lang/gcc gtk3
         run: |
           cd platforms/bsd
           gmake

.vscode/c_cpp_properties.json

@@ -8,7 +8,7 @@
             "intelliSenseMode": "linux-gcc-x64",
             "includePath": [
                 "${workspaceFolder}/**",
-                "/usr/include/SDL2"
+                "/usr/include"
             ],
             "browse": {
               "path": ["${workspaceFolder}"]
@@ -22,7 +22,7 @@
             "intelliSenseMode": "macos-clang-arm64",
             "includePath": [
                 "${workspaceFolder}/**",
-                "/opt/homebrew/include/SDL2"
+                "/opt/homebrew/include"
             ],
             "macFrameworkPath": ["/System/Library/Frameworks", "/Library/Frameworks"],
             "browse": {

README.md

@@ -101,7 +101,7 @@ Don't hesitate to report bugs or ask for new features by [opening an issue](http
 
 **Notes:**
 - **Windows**: May need [Visual C++ Redistributable](https://go.microsoft.com/fwlink/?LinkId=746572) and [OpenGL Compatibility Pack](https://apps.microsoft.com/detail/9nqpsl29bfff)
-- **Linux**: May need `libsdl2`
+- **Linux**: May need `libsdl3`
 
 ## Features
 
@@ -176,7 +176,7 @@ For complete setup instructions and tool documentation, see [MCP_README.md](MCP_
 - Run these commands to generate a Mac *app* bundle:
 
 ``` shell
-brew install sdl2
+brew install sdl3
 cd platforms/macos
 make dist
 ```
@@ -185,24 +185,38 @@ make dist
 
 - Ubuntu / Debian / Raspberry Pi (Raspbian):
 
+If you are using Ubuntu 25.04 or later, you can install SDL3 directly. Use the following commands to build:
+
+``` shell
+sudo apt install build-essential libsdl3-dev libgtk-3-dev
+cd platforms/linux
+make
+```
+
+For older Ubuntu versions (22.04, 24.04), you need to build SDL3 from source first. Use the following commands to build both SDL3 and Geargrafx:
+
 ``` shell
-sudo apt install build-essential libsdl2-dev libgtk-3-dev
+sudo apt install build-essential cmake libgtk-3-dev
+git clone --depth 1 --branch release-3.4.x https://github.com/libsdl-org/SDL.git /tmp/SDL3
+cmake -S /tmp/SDL3 -B /tmp/SDL3/build -DCMAKE_INSTALL_PREFIX=/usr -DSDL_TESTS=OFF -DSDL_EXAMPLES=OFF
+cmake --build /tmp/SDL3/build -j$(nproc)
+sudo cmake --install /tmp/SDL3/build
 cd platforms/linux
 make
 ```
 
 - Fedora:
 
 ``` shell
-sudo dnf install @development-tools gcc-c++ SDL2-devel gtk3-devel
+sudo dnf install @development-tools gcc-c++ SDL3-devel gtk3-devel
 cd platforms/linux
 make
 ```
 
 - Arch Linux:
 
 ``` shell
-sudo pacman -S base-devel sdl2 gtk3
+sudo pacman -S base-devel sdl3 gtk3
 cd platforms/linux
 make
 ```
@@ -212,15 +226,15 @@ make
 - FreeBSD:
 
 ``` shell
-su root -c "pkg install -y git gmake pkgconf SDL2 lang/gcc gtk3"
+su root -c "pkg install -y git gmake pkgconf SDL3 lang/gcc gtk3"
 cd platforms/bsd
 gmake
 ```
 
 - NetBSD:
 
 ``` shell
-su root -c "pkgin install gmake pkgconf SDL2 lang/gcc gtk3"
+su root -c "pkgin install gmake pkgconf SDL3 lang/gcc gtk3"
 cd platforms/bsd
 gmake
 ```

platforms/bsd/Makefile

@@ -1,7 +1,3 @@
 include ../shared/makefiles/Makefile.sources
 
-SOURCES_CXX += $(DEPS_DIR)/nfd/nfd_gtk.cpp
-CPPFLAGS += `pkg-config --cflags gtk+-3.0`
-LDFLAGS += `pkg-config --libs gtk+-3.0`
-
 include ../shared/makefiles/Makefile.common

platforms/linux/Makefile

@@ -1,7 +1,3 @@
 include ../shared/makefiles/Makefile.sources
 
-SOURCES_CXX += $(DEPS_DIR)/nfd/nfd_gtk.cpp
-CPPFLAGS += `pkg-config --cflags gtk+-3.0`
-LDFLAGS += `pkg-config --libs gtk+-3.0`
-
 include ../shared/makefiles/Makefile.common

platforms/macos/Makefile

@@ -1,9 +1,8 @@
 include ../shared/makefiles/Makefile.sources
 
-SOURCES_MM += $(DEPS_DIR)/nfd/nfd_cocoa.mm
 SOURCES_MM += macos.mm
 OBJECTS += $(SOURCES_MM:.mm=.o)
-LDFLAGS += -framework AppKit -framework UniformTypeIdentifiers
+LDFLAGS += -framework AppKit
 
 include ../shared/makefiles/Makefile.common
 
@@ -16,6 +15,10 @@ bundle:
 	cp iconfile.icns $(APP_NAME).app/Contents/Resources/
 	cp $(TARGET) $(APP_NAME).app/Contents/MacOS/
 	cp run.sh $(APP_NAME).app/Contents/MacOS/
+	$(eval SDL3_DYLIB := $(shell otool -L $(TARGET) | grep libSDL3 | awk '{print $$1}'))
+	cp $(SDL3_DYLIB) $(APP_NAME).app/Contents/Frameworks/
+	chmod 755 $(APP_NAME).app/Contents/Frameworks/libSDL3.0.dylib
+	install_name_tool -change $(SDL3_DYLIB) @executable_path/../Frameworks/libSDL3.0.dylib $(APP_NAME).app/Contents/MacOS/$(TARGET)
 	mkdir -p $(APP_NAME).app/Contents/Resources/mcp
 	cp ../shared/gamecontrollerdb.txt $(APP_NAME).app/Contents/Resources/
 	cp -r ../shared/desktop/mcp/resources $(APP_NAME).app/Contents/Resources/mcp/