fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! squash! fixup! Fix CI regressions

Author: HexDecimal

.github/workflows/python-package.yml

@@ -267,7 +267,7 @@ jobs:
                 libdrm-devel mesa-libgbm-devel libusb-devel
             git clone https://github.com/libsdl-org/SDL.git sdl_repo &&
             cmake -S sdl_repo -B sdl_build &&
-            cmake --build sdl_build --config Release &&
+            cmake --build sdl_build --config Release --prefix / &&
             cmake --install sdl_build --config Release --prefix /
           CIBW_BEFORE_TEST: pip install numpy
           CIBW_TEST_COMMAND: python -c "import tcod.context"

build_sdl.py

@@ -268,7 +268,7 @@ def on_directive_handle(
     assert matches
 
     for match in matches:
-        if Path(match, "SDL3/SDL_stdinc.h").is_file():
+        if Path(match, "SDL3/SDL.h").is_file():
             SDL_INCLUDE = match
             break
     else:
@@ -301,7 +301,6 @@ def get_cdef() -> tuple[str, dict[str, str]]:
         parser = SDLParser()
         parser.add_path(temp_dir)
         parser.add_path(SDL_INCLUDE)
-        assert Path(SDL_INCLUDE, "SDL3/SDL.h").exists(), SDL_INCLUDE
         parser.parse(
             """
         // Remove extern keyword.
@@ -315,9 +314,14 @@ def get_cdef() -> tuple[str, dict[str, str]]:
 
         #define SDL_oldnames_h_
 
-        #include <SDL3/SDL.h>
         """
         )
+        if (SDL_INCLUDE / "SDL3/SDL.h").exists():  # Regular path
+            parser.parse("#include <SDL3/SDL.h>\n")
+        elif (SDL_INCLUDE / "SDL.h").exists():  # Using MacOS dmg archive
+            parser.parse("#include <SDL.h>\n")
+        else:
+            raise AssertionError(SDL_INCLUDE)
         sdl_cdef = parser.get_output()
 
     sdl_cdef = RE_VAFUNC.sub("", sdl_cdef)