From 6f96a1dd58d68f01715d01aa59d0711c468eb3f6 Mon Sep 17 00:00:00 2001 From: "C. J. Howard" Date: Sun, 18 Aug 2019 15:42:54 +0800 Subject: [PATCH] Fix joystick hotplugging issue by building SDL with default settings --- CMakeLists.txt | 20 -------------------- modules/antkeeper-data | 2 +- modules/antkeeper-source | 2 +- modules/vmq | 2 +- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2568ec2..2f52681 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,26 +58,6 @@ ExternalProject_Add(SDL2 CMAKE_ARGS "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-DCMAKE_INSTALL_PREFIX=${MODULE_INSTALL_DIR}" - "-DSDL_ATOMIC=OFF" - "-DSDL_AUDIO=OFF" - "-DSDL_CPUINFO=ON" - "-DSDL_DLOPEN=ON" - "-DSDL_EVENTS=ON" - "-DSDL_FILE=OFF" - "-DSDL_FILESYSTEM=OFF" - "-DSDL_HAPTIC=ON" - "-DSDL_JOYSTICK=ON" - "-DSDL_LOADSO=ON" - "-DSDL_POWER=ON" - "-DSDL_RENDER=OFF" - "-DSDL_SHARED=ON" - "-DSDL_STATIC=OFF" - "-DSDL_STATIC_PIC=OFF" - "-DSDL_TEST=OFF" - "-DSDL_THREADS=OFF" - "-DSDL_TIMERS=ON" - "-DSDL_VIDEO=ON" - "-DVIDEO_VULKAN=OFF" BUILD_ALWAYS 0) # Build OpenAL Soft module diff --git a/modules/antkeeper-data b/modules/antkeeper-data index 502c6a7..b69b606 160000 --- a/modules/antkeeper-data +++ b/modules/antkeeper-data @@ -1 +1 @@ -Subproject commit 502c6a7b7920a9b965bf339778e82247a5da5b89 +Subproject commit b69b6063705a65a79c7f70703f0866d4d7aeda5e diff --git a/modules/antkeeper-source b/modules/antkeeper-source index 79e305f..52f21a7 160000 --- a/modules/antkeeper-source +++ b/modules/antkeeper-source @@ -1 +1 @@ -Subproject commit 79e305ffcc3b41b128c28a5dbaf8ece9a01f2e41 +Subproject commit 52f21a725c572bcae8793d5f03ec0347f538b6c8 diff --git a/modules/vmq b/modules/vmq index 8e2fce9..722e5c4 160000 --- a/modules/vmq +++ b/modules/vmq @@ -1 +1 @@ -Subproject commit 8e2fce9dd6471388830e8dec8c206b3e7d84e41d +Subproject commit 722e5c4ae3a517592b0972202907517b44be85d9