Commit 38a5aed97422f3cdc5fbbf1fa0ef406477af391b
2023-07-28T23:55:50
minor os/2 stuff merged from the bitwiseworks' fork
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
diff --git a/cmake/sdlplatform.cmake b/cmake/sdlplatform.cmake
index f55ad31..7daaa23 100644
--- a/cmake/sdlplatform.cmake
+++ b/cmake/sdlplatform.cmake
@@ -48,6 +48,8 @@ macro(SDL_DetectCMakePlatform)
set(SDL_CMAKE_PLATFORM HAIKU)
elseif(NINTENDO_3DS)
set(SDL_CMAKE_PLATFORM N3DS)
+ elseif(OS2)
+ set(SDL_CMAKE_PLATFORM OS2)
endif()
if(SDL_CMAKE_PLATFORM)
set(${SDL_CMAKE_PLATFORM} TRUE)
diff --git a/configure b/configure
index 6d4816b..8407ad3 100755
--- a/configure
+++ b/configure
@@ -28247,7 +28247,7 @@ fi
enable_hidapi_libusb=yes
require_hidapi_libusb=yes
;;
- *-*-os2* )
+ *-*-os2* )
enable_hidapi_libusb=yes
;;
esac
diff --git a/configure.ac b/configure.ac
index 3ca3480..374ddb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3614,7 +3614,7 @@ CheckHIDAPI()
enable_hidapi_libusb=yes
require_hidapi_libusb=yes
;;
- *-*-os2* )
+ *-*-os2* )
enable_hidapi_libusb=yes
;;
esac
diff --git a/src/joystick/os2/SDL_os2joystick.c b/src/joystick/os2/SDL_os2joystick.c
index d793997..7f72b62 100644
--- a/src/joystick/os2/SDL_os2joystick.c
+++ b/src/joystick/os2/SDL_os2joystick.c
@@ -702,10 +702,14 @@ static int joyGetEnv(struct _joycfg * joydata)
char tempnumber[5]; /* Temporary place to put numeric texts */
joyenv = SDL_getenv("SDL_OS2_JOYSTICK");
- if (joyenv == NULL) return 0;
+ if (joyenv == NULL) {
+ return 0;
+ }
/* 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 (*joyenv == '\'') {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 778cb79..a7099e1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -160,6 +160,8 @@ elseif(WINDOWS)
elseif(HAVE_X11)
add_sdl_test_executable(testnative NEEDS_RESOURCES testnative.c testnativex11.c testutils.c)
target_link_libraries(testnative X11)
+elseif(OS2)
+ add_sdl_test_executable(testnative NEEDS_RESOURCES testnative.c testnativeos2.c testutils.c)
endif()
add_sdl_test_executable(testoverlay2 NEEDS_RESOURCES testoverlay2.c testyuv_cvt.c testutils.c)