From 3c244928911920a215d7d923e4c60d53d0b8d30c Mon Sep 17 00:00:00 2001 From: hwsmm Date: Thu, 2 Jan 2025 13:23:25 +0900 Subject: [PATCH] Use sed instead of a patch --- External/build.sh | 2 +- External/exclude-gameinput.patch | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 External/exclude-gameinput.patch diff --git a/External/build.sh b/External/build.sh index c689e6b..3dba7bf 100755 --- a/External/build.sh +++ b/External/build.sh @@ -93,7 +93,7 @@ git reset --hard HEAD if [[ $RUNNER_OS == 'Windows' ]]; then echo "Patching SDL to not include gameinput.h" - patch -Np1 -i ../exclude-gameinput.patch + sed -i 's/#include /#_include /g' CMakeLists.txt fi cmake -B build $FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSDL_SHARED_ENABLED_BY_DEFAULT=ON -DSDL_STATIC_ENABLED_BY_DEFAULT=ON diff --git a/External/exclude-gameinput.patch b/External/exclude-gameinput.patch deleted file mode 100644 index c85c42f..0000000 --- a/External/exclude-gameinput.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1953,6 +1953,7 @@ elseif(WINDOWS) - check_c_source_compiles(" - #include - #define COBJMACROS -+ #error SDL does not build on Github Actions with GameInput - #include - int main(int argc, char **argv) { return 0; }" HAVE_GAMEINPUT_H - )