fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Parse SDL headers from EMSDK during Pyodide builds

Author: HexDecimal

.github/workflows/python-package.yml

@@ -332,6 +332,7 @@ jobs:
         run: git submodule update --init --recursive --depth 1
       - uses: pypa/cibuildwheel@v3.0.0
         env:
+          CIBW_BEFORE_BUILD: emcc --show-ports && emcc --use-port=sdl3
           CIBW_PLATFORM: pyodide
       - name: Archive wheel
         uses: actions/upload-artifact@v4

build_sdl.py

@@ -251,6 +251,15 @@ 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."""
+    # 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)
+    raise AssertionError(os.environ["PATH"])
+
+
 check_sdl_version()
 
 SDL_PARSE_PATH: Path | None = None
@@ -261,16 +270,7 @@ def on_directive_handle(
 
 SDL_INCLUDE: Path
 if "PYODIDE" in os.environ:
-    # 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"):
-            print(f"{list(Path(path).iterdir())}")
-            SDL_INCLUDE = Path(path, "system/include")
-            print(f"{list(SDL_INCLUDE.iterdir())}")
-            print(f"{list((SDL_INCLUDE / 'SDL').iterdir())}")
-            break
-    else:
-        raise AssertionError(os.environ["PATH"])
+    SDL_INCLUDE = get_emscripten_include_dir()
 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: