From 460b2b75d0d0147c81300bb1c5e41a1e5ac953bc Mon Sep 17 00:00:00 2001 From: Triang3l Date: Sat, 12 Jun 2021 14:49:38 +0300 Subject: [PATCH] [SDL2] Switch to libsdl-org/SDL --- .gitmodules | 2 +- third_party/SDL2 | 2 +- third_party/SDL2-static.lua | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 35b49aab7..630625cc5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -48,7 +48,7 @@ url = https://github.com/jarro2783/cxxopts.git [submodule "third_party/SDL2"] path = third_party/SDL2 - url = https://github.com/JoelLinn/SDL.git + url = https://github.com/libsdl-org/SDL.git [submodule "third_party/utfcpp"] path = third_party/utfcpp url = https://github.com/xenia-project/utfcpp.git diff --git a/third_party/SDL2 b/third_party/SDL2 index 804f883c4..d28437de3 160000 --- a/third_party/SDL2 +++ b/third_party/SDL2 @@ -1 +1 @@ -Subproject commit 804f883c4048d1c0a549660c1c82590f0aee422d +Subproject commit d28437de3c74d2514fc96d4e0da1dec4113e8929 diff --git a/third_party/SDL2-static.lua b/third_party/SDL2-static.lua index cd78626fb..d30f914b3 100644 --- a/third_party/SDL2-static.lua +++ b/third_party/SDL2-static.lua @@ -243,6 +243,7 @@ project("SDL2") "SDL2/src/joystick/hidapi/SDL_hidapi_ps4.c", "SDL2/src/joystick/hidapi/SDL_hidapi_ps5.c", "SDL2/src/joystick/hidapi/SDL_hidapi_rumble.c", + "SDL2/src/joystick/hidapi/SDL_hidapi_stadia.c", "SDL2/src/joystick/hidapi/SDL_hidapi_switch.c", "SDL2/src/joystick/hidapi/SDL_hidapi_xbox360.c", "SDL2/src/joystick/hidapi/SDL_hidapi_xbox360w.c", @@ -320,7 +321,7 @@ project("SDL2") "SDL2/src/stdlib/SDL_strtokr.c", "SDL2/src/thread/generic/SDL_syscond.c", "SDL2/src/thread/SDL_thread.c", - "SDL2/src/thread/windows/SDL_syscond.c", + "SDL2/src/thread/windows/SDL_syscond_srw.c", "SDL2/src/thread/windows/SDL_sysmutex.c", "SDL2/src/thread/windows/SDL_syssem.c", "SDL2/src/thread/windows/SDL_systhread.c",