Reset git tree before generate/build

ppy · Sep 18, 2024 · a035dd9 · a035dd9
1 parent e207e72
commit a035dd9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/External/build.sh b/External/build.sh
@@ -87,6 +87,7 @@ fi
 
 # Build SDL
 pushd SDL >/dev/null
+git reset --hard HEAD
 cmake -B build $FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSDL_SHARED_ENABLED_BY_DEFAULT=ON -DSDL_STATIC_ENABLED_BY_DEFAULT=ON
 cmake --build build/ --config Release
 $SUDO cmake --install build/ --prefix install_output --config Release

diff --git a/SDL3-CS/generate_bindings.py b/SDL3-CS/generate_bindings.py
@@ -130,7 +130,14 @@ def add(s: str):
     add("SDL3/SDL_vulkan.h"),
 ]
 
-def patch_sdl_types():
+def prepare_sdl_source():
+    subprocess.run([
+        "git",
+        "reset",
+        "--hard",
+        "HEAD"
+    ], cwd = SDL_root)
+
     subprocess.run([
         "git",
         "apply",
@@ -298,7 +305,7 @@ def get_string_returning_functions(sdl_api):
 
 
 def main():
-    patch_sdl_types()
+    prepare_sdl_source()
 
     sdl_api = get_sdl_api_dump()