fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into vulkan

Browse Source
This commit is contained in:
Triang3l
2021-06-12 14:51:01 +03:00
parent e4b239784c 460b2b75d0
commit 322921233c
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@@ -39,7 +39,7 @@
url = https://github.com/jarro2783/cxxopts.git url = https://github.com/jarro2783/cxxopts.git
[submodule "third_party/SDL2"] [submodule "third_party/SDL2"]
path = 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"] [submodule "third_party/utfcpp"]
path = third_party/utfcpp path = third_party/utfcpp
url = https://github.com/xenia-project/utfcpp.git url = https://github.com/xenia-project/utfcpp.git

2
third_party/SDL2 vendored

Submodule third_party/SDL2 updated: 804f883c40...d28437de3c

3
third_party/SDL2-static.lua vendored
View File

@@ -243,6 +243,7 @@ project("SDL2")
"SDL2/src/joystick/hidapi/SDL_hidapi_ps4.c", "SDL2/src/joystick/hidapi/SDL_hidapi_ps4.c",
"SDL2/src/joystick/hidapi/SDL_hidapi_ps5.c", "SDL2/src/joystick/hidapi/SDL_hidapi_ps5.c",
"SDL2/src/joystick/hidapi/SDL_hidapi_rumble.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_switch.c",
"SDL2/src/joystick/hidapi/SDL_hidapi_xbox360.c", "SDL2/src/joystick/hidapi/SDL_hidapi_xbox360.c",
"SDL2/src/joystick/hidapi/SDL_hidapi_xbox360w.c", "SDL2/src/joystick/hidapi/SDL_hidapi_xbox360w.c",
@@ -320,7 +321,7 @@ project("SDL2")
"SDL2/src/stdlib/SDL_strtokr.c", "SDL2/src/stdlib/SDL_strtokr.c",
"SDL2/src/thread/generic/SDL_syscond.c", "SDL2/src/thread/generic/SDL_syscond.c",
"SDL2/src/thread/SDL_thread.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_sysmutex.c",
"SDL2/src/thread/windows/SDL_syssem.c", "SDL2/src/thread/windows/SDL_syssem.c",
"SDL2/src/thread/windows/SDL_systhread.c", "SDL2/src/thread/windows/SDL_systhread.c",