ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SDL2] Update submodule.

This commit is contained in:
Joel Linn 2020-11-07 13:17:44 +01:00 committed by Rick Gibbed
parent 9009cba90a
commit be92ab222b
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -51,7 +51,7 @@
url = https://github.com/jarro2783/cxxopts.git
[submodule "third_party/SDL2"]
path = third_party/SDL2
url = https://github.com/spurious/SDL-mirror.git
url = https://github.com/JoelLinn/SDL.git
[submodule "third_party/utfcpp"]
path = third_party/utfcpp
url = https://github.com/xenia-project/utfcpp.git

2
third_party/SDL2 vendored

@ -1 +1 @@
Subproject commit 863c4bd26b51892864c6042ad2db474e11b08fed
Subproject commit 804f883c4048d1c0a549660c1c82590f0aee422d

32
third_party/SDL2-static.lua vendored
View File

@ -17,11 +17,8 @@ project("SDL2")
includedirs({
"SDL2/include",
})
buildoptions({
"/wd4828", -- illegal characters in file https://bugzilla.libsdl.org/show_bug.cgi?id=5333
})
files({
-- 1:1 from SDL.vcxproj file
-- 1:1 from SDL2/VisualC/SDL/SDL.vcxproj file
"SDL2/include/begin_code.h",
"SDL2/include/close_code.h",
@ -49,9 +46,11 @@ project("SDL2")
"SDL2/include/SDL_keyboard.h",
"SDL2/include/SDL_keycode.h",
"SDL2/include/SDL_loadso.h",
"SDL2/include/SDL_locale.h",
"SDL2/include/SDL_log.h",
"SDL2/include/SDL_main.h",
"SDL2/include/SDL_messagebox.h",
"SDL2/include/SDL_misc.h",
"SDL2/include/SDL_mouse.h",
"SDL2/include/SDL_mutex.h",
"SDL2/include/SDL_name.h",
@ -107,6 +106,7 @@ project("SDL2")
"SDL2/src/audio/wasapi/SDL_wasapi.h",
"SDL2/src/audio/winmm/SDL_winmm.h",
"SDL2/src/core/windows/SDL_directx.h",
"SDL2/src/core/windows/SDL_hid.h",
"SDL2/src/core/windows/SDL_windows.h",
"SDL2/src/core/windows/SDL_xinput.h",
"SDL2/src/dynapi/SDL_dynapi.h",
@ -128,15 +128,20 @@ project("SDL2")
"SDL2/src/haptic/windows/SDL_dinputhaptic_c.h",
"SDL2/src/haptic/windows/SDL_windowshaptic_c.h",
"SDL2/src/haptic/windows/SDL_xinputhaptic_c.h",
"SDL2/src/hidapi/hidapi/hidapi.h",
"SDL2/src/joystick/controller_type.h",
"SDL2/src/joystick/hidapi/SDL_hidapijoystick_c.h",
"SDL2/src/joystick/SDL_gamecontrollerdb.h",
"SDL2/src/joystick/SDL_joystick_c.h",
"SDL2/src/joystick/SDL_sysjoystick.h",
"SDL2/src/joystick/virtual/SDL_virtualjoystick_c.h",
"SDL2/src/joystick/windows/SDL_dinputjoystick_c.h",
"SDL2/src/joystick/windows/SDL_rawinputjoystick_c.h",
"SDL2/src/joystick/windows/SDL_windowsjoystick_c.h",
"SDL2/src/joystick/windows/SDL_xinputjoystick_c.h",
"SDL2/src/libm/math_libm.h",
"SDL2/src/libm/math_private.h",
"SDL2/src/locale/SDL_syslocale.h",
"SDL2/src/render/direct3d11/SDL_shaders_d3d11.h",
"SDL2/src/render/direct3d/SDL_shaders_d3d.h",
"SDL2/src/render/opengl/SDL_glfuncs.h",
@ -158,8 +163,11 @@ project("SDL2")
"SDL2/src/sensor/dummy/SDL_dummysensor.h",
"SDL2/src/sensor/SDL_sensor_c.h",
"SDL2/src/sensor/SDL_syssensor.h",
"SDL2/src/sensor/windows/SDL_windowssensor.h",
"SDL2/src/thread/SDL_systhread.h",
"SDL2/src/thread/SDL_thread_c.h",
"SDL2/src/thread/generic/SDL_syscond_c.h",
"SDL2/src/thread/windows/SDL_sysmutex_c.h",
"SDL2/src/thread/windows/SDL_systhread_c.h",
"SDL2/src/timer/SDL_timer_c.h",
"SDL2/src/video/dummy/SDL_nullevents_c.h",
@ -206,6 +214,7 @@ project("SDL2")
"SDL2/src/audio/winmm/SDL_winmm.c",
"SDL2/src/audio/wasapi/SDL_wasapi.c",
"SDL2/src/audio/wasapi/SDL_wasapi_win32.c",
"SDL2/src/core/windows/SDL_hid.c",
"SDL2/src/core/windows/SDL_windows.c",
"SDL2/src/core/windows/SDL_xinput.c",
"SDL2/src/cpuinfo/SDL_cpuinfo.c",
@ -222,14 +231,17 @@ project("SDL2")
"SDL2/src/events/SDL_windowevents.c",
"SDL2/src/file/SDL_rwops.c",
"SDL2/src/filesystem/windows/SDL_sysfilesystem.c",
"SDL2/src/haptic/dummy/SDL_syshaptic.c",
"SDL2/src/haptic/SDL_haptic.c",
"SDL2/src/haptic/windows/SDL_dinputhaptic.c",
"SDL2/src/haptic/windows/SDL_windowshaptic.c",
"SDL2/src/haptic/windows/SDL_xinputhaptic.c",
"SDL2/src/hidapi/windows/hid.c",
"SDL2/src/hidapi/SDL_hidapi.c",
"SDL2/src/joystick/dummy/SDL_sysjoystick.c",
"SDL2/src/joystick/hidapi/SDL_hidapijoystick.c",
"SDL2/src/joystick/hidapi/SDL_hidapi_gamecube.c",
"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_switch.c",
"SDL2/src/joystick/hidapi/SDL_hidapi_xbox360.c",
@ -237,9 +249,12 @@ project("SDL2")
"SDL2/src/joystick/hidapi/SDL_hidapi_xboxone.c",
"SDL2/src/joystick/SDL_gamecontroller.c",
"SDL2/src/joystick/SDL_joystick.c",
"SDL2/src/joystick/virtual/SDL_virtualjoystick.c",
"SDL2/src/joystick/windows/SDL_dinputjoystick.c",
"SDL2/src/joystick/windows/SDL_mmjoystick.c",
"SDL2/src/joystick/windows/SDL_rawinputjoystick.c",
"SDL2/src/joystick/windows/SDL_windowsjoystick.c",
"SDL2/src/joystick/windows/SDL_windows_gaming_input.c",
"SDL2/src/joystick/windows/SDL_xinputjoystick.c",
"SDL2/src/libm/e_atan2.c",
"SDL2/src/libm/e_exp.c",
@ -262,6 +277,10 @@ project("SDL2")
"SDL2/src/libm/s_sin.c",
"SDL2/src/libm/s_tan.c",
"SDL2/src/loadso/windows/SDL_sysloadso.c",
"SDL2/src/locale/SDL_locale.c",
"SDL2/src/locale/windows/SDL_syslocale.c",
"SDL2/src/misc/SDL_url.c",
"SDL2/src/misc/windows/SDL_sysurl.c",
"SDL2/src/power/SDL_power.c",
"SDL2/src/power/windows/SDL_syspower.c",
"SDL2/src/render/direct3d11/SDL_shaders_d3d11.c",
@ -290,6 +309,8 @@ project("SDL2")
"SDL2/src/SDL_log.c",
"SDL2/src/sensor/dummy/SDL_dummysensor.c",
"SDL2/src/sensor/SDL_sensor.c",
"SDL2/src/sensor/windows/SDL_windowssensor.c",
"SDL2/src/stdlib/SDL_crc32.c",
"SDL2/src/stdlib/SDL_getenv.c",
"SDL2/src/stdlib/SDL_iconv.c",
"SDL2/src/stdlib/SDL_malloc.c",
@ -299,6 +320,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_sysmutex.c",
"SDL2/src/thread/windows/SDL_syssem.c",
"SDL2/src/thread/windows/SDL_systhread.c",