duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support GLFW <3.3

Browse source 
Travis's Ubuntu Bionic uses 3.2, causing it to fail.
This commit is contained in:
Clownacy 2020-04-03 18:13:44 +01:00
parent f548044464
commit cb869a4fd1
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Backends/GLFW3/Controller.cpp
View file

@ -27,7 +27,11 @@ BOOL ControllerBackend_Init(void)
for (int i = GLFW_JOYSTICK_1; i < GLFW_JOYSTICK_LAST; ++i)
{
#if GLFW_VERSION_MAJOR > 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 3)
if (glfwJoystickPresent(i) == GLFW_TRUE && glfwJoystickIsGamepad(i) == GLFW_TRUE)
#else
if (glfwJoystickPresent(i) == GLFW_TRUE)
#endif
{
printf("Joystick #%d selected\n", i);
joystick_connected = TRUE;
@ -44,7 +48,11 @@ BOOL ControllerBackend_GetJoystickStatus(JOYSTICK_STATUS *status)
if (!joystick_connected)
return FALSE;
#if GLFW_VERSION_MAJOR > 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 3)
if (glfwJoystickPresent(connected_joystick_id) == GLFW_FALSE || glfwJoystickIsGamepad(connected_joystick_id) == GLFW_FALSE)
#else
if (glfwJoystickPresent(connected_joystick_id) == GLFW_FALSE)
#endif
return FALSE;
int total_axis;
@ -75,7 +83,11 @@ BOOL ControllerBackend_ResetJoystickStatus(void)
if (!joystick_connected)
return FALSE;
#if GLFW_VERSION_MAJOR > 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR >= 3)
if (glfwJoystickPresent(connected_joystick_id) == GLFW_FALSE || glfwJoystickIsGamepad(connected_joystick_id) == GLFW_FALSE)
#else
if (glfwJoystickPresent(connected_joystick_id) == GLFW_FALSE)
#endif
return FALSE;
int total_axis;