ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-23 05:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor os/2 stuff merged from the bitwiseworks' fork

Browse source
This commit is contained in:
Ozkan Sezer 2023-07-28 23:55:50 +03:00
parent 3e341021c3
commit 7cc3248044
5 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/sdlplatform.cmake
View file

@ -48,6 +48,8 @@ macro(SDL_DetectCMakePlatform)
set(SDL_CMAKE_PLATFORM HAIKU) set(SDL_CMAKE_PLATFORM HAIKU)
elseif(NINTENDO_3DS) elseif(NINTENDO_3DS)
set(SDL_CMAKE_PLATFORM N3DS) set(SDL_CMAKE_PLATFORM N3DS)
elseif(OS2)
set(SDL_CMAKE_PLATFORM OS2)
endif() endif()
if(SDL_CMAKE_PLATFORM) if(SDL_CMAKE_PLATFORM)
set(${SDL_CMAKE_PLATFORM} TRUE) set(${SDL_CMAKE_PLATFORM} TRUE)

8
src/joystick/os2/SDL_os2joystick.c
View file

@ -702,10 +702,14 @@ static int joyGetEnv(struct _joycfg * joydata)
char tempnumber[5]; /* Temporary place to put numeric texts */ char tempnumber[5]; /* Temporary place to put numeric texts */
joyenv = SDL_getenv("SDL_OS2_JOYSTICK"); joyenv = SDL_getenv("SDL_OS2_JOYSTICK");
if (joyenv == NULL) return 0; if (joyenv == NULL) {
return 0;
}
/* Joystick Environment is defined! */ /* Joystick Environment is defined! */
while (*joyenv == ' ' && *joyenv != 0) joyenv++; /* jump spaces... */ while (*joyenv == ' ' && *joyenv != 0) {
joyenv++; /* jump spaces... */
}
/* If the string name starts with '... get if fully */ /* If the string name starts with '... get if fully */
if (*joyenv == '\'') { if (*joyenv == '\'') {

2
test/CMakeLists.txt
View file

@ -160,6 +160,8 @@ elseif(WINDOWS)
elseif(HAVE_X11) elseif(HAVE_X11)
add_sdl_test_executable(testnative NEEDS_RESOURCES testnative.c testnativex11.c testutils.c) add_sdl_test_executable(testnative NEEDS_RESOURCES testnative.c testnativex11.c testutils.c)
target_link_libraries(testnative X11) target_link_libraries(testnative X11)
elseif(OS2)
add_sdl_test_executable(testnative NEEDS_RESOURCES testnative.c testnativeos2.c testutils.c)
endif() endif()
add_sdl_test_executable(testoverlay2 NEEDS_RESOURCES testoverlay2.c testyuv_cvt.c testutils.c) add_sdl_test_executable(testoverlay2 NEEDS_RESOURCES testoverlay2.c testyuv_cvt.c testutils.c)