Merge branch 'master' into vulkan

This commit is contained in:
Triang3l
2021-06-12 14:51:01 +03:00
3 changed files with 4 additions and 3 deletions
+2 -1
View File
@@ -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",