diff --git a/aedi/target/library_tier2.py b/aedi/target/library_tier2.py index a307ad4a..efc63352 100644 --- a/aedi/target/library_tier2.py +++ b/aedi/target/library_tier2.py @@ -458,7 +458,7 @@ class Sdl2Target(CMakeStaticDependencyTarget): state.download_source( 'https://libsdl.org/release/SDL2-2.0.18.tar.gz', '94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c', - patches='sdl2-no-updaterev') + patches=('sdl2-no-updaterev', 'sdl2-no-gamecontroller+corehaptic')) FRAMEWORKS = '-framework AudioToolbox -framework AVFoundation -framework Carbon' \ ' -framework Cocoa -framework CoreAudio -framework CoreVideo -framework ForceFeedback' \ diff --git a/patch/sdl2-no-gamecontroller+corehaptic.diff b/patch/sdl2-no-gamecontroller+corehaptic.diff new file mode 100644 index 00000000..402e45e0 --- /dev/null +++ b/patch/sdl2-no-gamecontroller+corehaptic.diff @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1860,7 +1860,7 @@ + #import + #import + int main() {}" HAVE_FRAMEWORK_COREHAPTICS) +- if(HAVE_FRAMEWORK_GAMECONTROLLER AND HAVE_FRAMEWORK_COREHAPTICS) ++ if(0) + # Only enable MFI if we also have CoreHaptics to ensure rumble works + set(SDL_JOYSTICK_MFI 1) + set(SDL_FRAMEWORK_GAMECONTROLLER 1)