Changed to bundle SDL2 for Linux and use macOS 15 for build

Author: kitao

.github/workflows/build.yml

@@ -17,17 +17,19 @@ jobs:
             arch: x86
 
           - target: x86_64-apple-darwin
-            os: macos-13
+            os: macos-15-intel
             arch: x64
+            min_macos: "10.13"
 
           - target: aarch64-apple-darwin
-            os: macos-13
-            arch: x64
+            os: macos-15
+            arch: arm64
+            min_macos: "11.0"
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
@@ -50,7 +52,10 @@ jobs:
         run: pip install -r python/requirements.txt
 
       - name: Build wheel
-        run: make TARGET=${{ matrix.target }}
+        shell: bash
+        run: |
+          export MACOSX_DEPLOYMENT_TARGET=${{ matrix.min_macos }}
+          make TARGET=${{ matrix.target }}
 
       - name: Upload wheel
         uses: actions/upload-artifact@v4
@@ -80,7 +85,7 @@ jobs:
 
     steps:
       - name: Check out repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
@@ -93,40 +98,22 @@ jobs:
           toolchain: nightly-2025-02-17
           components: rustfmt
 
-      - name: Install Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.12"
-
       - name: Install Python packages
         run: pip install -r python/requirements.txt
 
-      - name: Build and install SDL2
+      - name: Install build deps (X11/ALSA headers)
         run: |
-          SDL2_VERSION=2.0.10
-          export CC=$TARGET_CC
-          export AR=$TARGET_AR
-          export RANLIB=$TARGET_RANLIB
-
-          curl -sqLO https://github.com/libsdl-org/SDL/releases/download/release-${SDL2_VERSION}/SDL2-${SDL2_VERSION}.tar.gz
-          tar xzf SDL2-${SDL2_VERSION}.tar.gz
-
-          cd SDL2-${SDL2_VERSION}
-          CFLAGS="-O3 -fPIC" ./configure \
-            --build=x86_64-unknown-linux-gnu \
-            --host=${{ matrix.target }} \
-            --prefix=/usr/${{ matrix.target }}
-          make -j4
-          make install
-          cd ..
-
-          rm -rf SDL2-${SDL2_VERSION}
+          if command -v yum >/dev/null 2>&1; then
+            yum install -y gcc gcc-c++ make pkgconfig \
+              alsa-lib-devel \
+              libX11-devel libXext-devel libXcursor-devel libXrandr-devel libXi-devel libXinerama-devel
+          fi
 
       - name: Build wheel
         run: |
-          export BINDGENFLAGS="-I/usr/${{ matrix.target }}/include/SDL2 -I/usr/${{ matrix.target }}/${{ matrix.target }}/sysroot/usr/include"
-          export RUSTFLAGS="-L/usr/${{ matrix.target }}/lib"
-
+          export CC=$TARGET_CC
+          export AR=$TARGET_AR
+          export RANLIB=$TARGET_RANLIB
           make TARGET=${{ matrix.target }}
 
       - name: Upload wheel

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - Changed desktop OpenGL internal format to GL_R8
 - Fixed Tilemap.data_ptr to expose full map data
+- Changed to bundle SDL2 for Linux
+- Updated the build environment version for Mac to macOS 15
 
 ## 2.5.7
 

Makefile

@@ -63,7 +63,7 @@ WASM_TARGET = wasm32-unknown-emscripten
 
 # Tool options
 CLIPPY_OPTS = -q -- --no-deps
-MATURIN_OPTS = --manylinux 2014 --auditwheel skip
+MATURIN_OPTS = --manylinux 2014
 
 # Build options
 TARGET ?= $(shell rustc -vV | awk '/^host:/ {print $$2}')
@@ -73,6 +73,8 @@ ifneq (,$(findstring windows,$(TARGET)))
 CARGO_FEATURES = --features sdl2_bundle
 else ifneq (,$(findstring darwin,$(TARGET)))
 CARGO_FEATURES = --features sdl2_bundle
+else ifneq (,$(findstring linux,$(TARGET)))
+CARGO_FEATURES = --features sdl2_bundle
 else
 CARGO_FEATURES = --features sdl2
 endif

rust/pyxel-platform/build.rs

@@ -100,10 +100,14 @@ impl Sdl2Bindings {
         let mut cfg = cmake::Config::new(&self.sdl2_dir);
         cfg.profile("release")
             .cflag("-D__FLTUSED__")
-            .define("SDL_SHARED", "OFF")
-            .define("SDL_STATIC", "ON")
             .define("SDL_MAIN_HANDLED", "ON");
 
+        if self.target_os == "linux-gnu" {
+            cfg.define("SDL_SHARED", "ON").define("SDL_STATIC", "OFF");
+        } else {
+            cfg.define("SDL_SHARED", "OFF").define("SDL_STATIC", "ON");
+        }
+
         if self.target_os == "windows-gnu" {
             cfg.define("VIDEO_OPENGLES", "OFF");
         }
@@ -121,14 +125,9 @@ impl Sdl2Bindings {
 
     fn link_sdl2(&self) {
         if bundle_sdl2() {
-            println!("cargo:rustc-link-lib=static=SDL2main");
             if self.target_os.contains("windows") {
+                println!("cargo:rustc-link-lib=static=SDL2main");
                 println!("cargo:rustc-link-lib=static=SDL2-static");
-            } else {
-                println!("cargo:rustc-link-lib=static=SDL2");
-            }
-
-            if self.target_os.contains("windows") {
                 println!("cargo:rustc-link-lib=shell32");
                 println!("cargo:rustc-link-lib=user32");
                 println!("cargo:rustc-link-lib=gdi32");
@@ -142,6 +141,8 @@ impl Sdl2Bindings {
                 println!("cargo:rustc-link-lib=dxguid");
                 println!("cargo:rustc-link-lib=setupapi");
             } else if self.target_os == "darwin" {
+                println!("cargo:rustc-link-lib=static=SDL2main");
+                println!("cargo:rustc-link-lib=static=SDL2");
                 println!("cargo:rustc-link-lib=framework=Cocoa");
                 println!("cargo:rustc-link-lib=framework=IOKit");
                 println!("cargo:rustc-link-lib=framework=Carbon");
@@ -153,6 +154,8 @@ impl Sdl2Bindings {
                 println!("cargo:rustc-link-lib=framework=AudioToolbox");
                 println!("cargo:rustc-link-lib=framework=Metal");
                 println!("cargo:rustc-link-lib=iconv");
+            } else if self.target_os == "linux-gnu" {
+                println!("cargo:rustc-link-lib=SDL2");
             }
         } else if self.target_os != "emscripten" {
             println!("cargo:rustc-flags=-l SDL2");