From a035dd9f99ced097f4fd191c6a6f9ebf0fc0bb8e Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Wed, 18 Sep 2024 17:55:45 +0900 Subject: [PATCH] Reset git tree before generate/build --- External/build.sh | 1 + SDL3-CS/generate_bindings.py | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/External/build.sh b/External/build.sh index 06e01bf..9a715ed 100755 --- 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 index 650b595..67adf6a 100644 --- a/SDL3-CS/generate_bindings.py +++ b/SDL3-CS/generate_bindings.py @@ -130,7 +130,14 @@ headers = [ 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()