Parse SDL headers directly from Emscripten

Simpler and easier than including the SDL headers externally

Author: HexDecimal

.github/workflows/python-package.yml

@@ -350,25 +350,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include: # https://pyodide.org/en/stable/development/abi.html
-          - python: "cp313"
-            sdl-version: "3.2.4" # For Emscripten 4.0.9
-          - python: "cp314"
-            sdl-version: "3.2.30" # For Emscripten 5.0.3
-          - python: "cp315"
-            sdl-version: "3.4.2" # For Emscripten 6.0.5
+        python: ["cp313", "cp314", "cp315"] # https://pyodide.org/en/stable/development/abi.html
     steps:
       - uses: actions/checkout@v7
         with:
           persist-credentials: false
           fetch-depth: ${{ env.git-depth }}
       - name: Checkout submodules
         run: git submodule update --init --recursive --depth 1
-      - uses: libsdl-org/setup-sdl@v1.0.1
-        with:
-          install-linux-dependencies: true
-          build-type: "Debug"
-          version: ${{ matrix.sdl-version }} # Should be equal or less than the version used by Emscripten
       - uses: pypa/cibuildwheel@v4.3.3
         env:
           CIBW_BUILD: ${{ matrix.python }}-pyodide_wasm32

.vscode/settings.json

@@ -149,6 +149,7 @@
         "dunder",
         "DVLINE",
         "elif",
+        "embuilder",
         "Emscripten",
         "EMSDK",
         "ENDCALL",

build_sdl.py

@@ -147,6 +147,8 @@ def check_sdl_version() -> None:
     """Check the local SDL3 version on Linux distributions."""
     if not sys.platform.startswith("linux"):
         return
+    if "PYODIDE" in os.environ:
+        return
     needed_version = f"{SDL_MIN_VERSION[0]}.{SDL_MIN_VERSION[1]}.{SDL_MIN_VERSION[2]}"
     try:
         sdl_version_str = subprocess.check_output(
@@ -280,12 +282,14 @@ def on_directive_handle(
         return super().on_directive_handle(directive, tokens, if_passthru, preceding_tokens)
 
 
-def get_emscripten_include_dir() -> Path:
-    """Find and return the Emscripten include dir."""
+def get_emscripten_dir() -> Path:
+    """Find and return the Emscripten root directory."""
+    if "EMSDK" in os.environ:
+        return Path(os.environ["EMSDK"])
     # None of the EMSDK environment variables exist! Search PATH for Emscripten as a workaround
     for path in os.environ["PATH"].split(os.pathsep)[::-1]:
-        if Path(path).match("upstream/emscripten"):
-            return Path(path, "system/include").resolve(strict=True)
+        if Path(path).match("upstream/emscripten/embuilder"):
+            return Path(path).resolve(strict=True)
     raise AssertionError(os.environ["PATH"])
 
 
@@ -298,7 +302,11 @@ def get_emscripten_include_dir() -> Path:
     SDL_BUNDLE_PATH = unpack_sdl(SDL_BUNDLE_VERSION)
 
 SDL_INCLUDE: Path
-if sys.platform == "win32" and SDL_PARSE_PATH is not None:
+if "PYODIDE" in os.environ:
+    embuilder = Path(get_emscripten_dir(), "upstream/emscripten/embuilder")
+    subprocess.run([embuilder, "build", "sdl3"], check=True)
+    SDL_INCLUDE = Path(get_emscripten_dir(), "upstream/emscripten/cache/sysroot/include/SDL3")
+elif sys.platform == "win32" and SDL_PARSE_PATH is not None:
     SDL_INCLUDE = SDL_PARSE_PATH / "include"
 elif sys.platform == "darwin" and SDL_PARSE_PATH is not None:
     SDL_INCLUDE = SDL_PARSE_PATH / "Versions/A/Headers"