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

Author: HexDecimal

build_sdl.py

@@ -262,12 +262,12 @@ 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):
+    for path in os.environ["PATH"].split(os.pathsep)[::-1]:
         if Path(path).match("upstream/emscripten"):
             SDL_INCLUDE = Path(path)
             break
     else:
-        raise AssertionError
+        raise AssertionError(os.environ["PATH"])
 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:
@@ -392,11 +392,10 @@ def get_cdef() -> tuple[str, dict[str, str]]:
     extra_link_args += ["-rpath", "/usr/local/opt/llvm/lib/"]
 
 # Use sdl-config to link to SDL on Linux.
-if sys.platform not in ["win32", "darwin"]:
+if sys.platform not in ["win32", "darwin"] and "PYODIDE" not in os.environ:
     extra_compile_args += (
         subprocess.check_output(["pkg-config", "sdl3", "--cflags"], universal_newlines=True).strip().split()
     )
-    if "PYODIDE" not in os.environ:
-        extra_link_args += (
-            subprocess.check_output(["pkg-config", "sdl3", "--libs"], universal_newlines=True).strip().split()
-        )
+    extra_link_args += (
+        subprocess.check_output(["pkg-config", "sdl3", "--libs"], universal_newlines=True).strip().split()
+    )

setup.py

@@ -74,11 +74,6 @@ def check_sdl_version() -> None:
     print("Did you forget to run 'git submodule update --init'?")
     sys.exit(1)
 
-print(f"{os.environ.get('EMSDK')=}")
-print(f"{os.environ.get('EMSCRIPTEN')=}")
-print(f"{os.environ.get('EMSCRIPTEN_ROOT')=}")
-print(f"{os.environ.get('PYODIDE')=}")
-
 check_sdl_version()
 
 setup(