AuroraMiddleware/glfw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replaced ad-hoc Linux detection with __linux__.

Browse Source
This commit is contained in:
Camilla Berglund 2012-11-05 16:19:11 +01:00
parent 2b4c556cd0
commit ad7bf4beba
4 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -185,10 +185,6 @@ if (_GLFW_X11_GLX)
set(GLFW_PKG_LIBS "${GLFW_PKG_LIBS} -ldl") set(GLFW_PKG_LIBS "${GLFW_PKG_LIBS} -ldl")
endif() endif()
endif() endif()
if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
set(_GLFW_HAS_LINUX_JOYSTICKS 1)
endif()
endif() endif()
#-------------------------------------------------------------------- #--------------------------------------------------------------------

3
src/config.h.in
View File

@ -63,9 +63,6 @@
// Define this to 1 if glXGetProcAddressEXT is available // Define this to 1 if glXGetProcAddressEXT is available
#cmakedefine _GLFW_HAS_GLXGETPROCADDRESSEXT #cmakedefine _GLFW_HAS_GLXGETPROCADDRESSEXT
// Define this to 1 if the Linux joystick API is available
#cmakedefine _GLFW_HAS_LINUX_JOYSTICKS
// The GLFW version as used by glfwGetVersionString // The GLFW version as used by glfwGetVersionString
#define _GLFW_VERSION_FULL "@GLFW_VERSION_FULL@" #define _GLFW_VERSION_FULL "@GLFW_VERSION_FULL@"

2
src/x11_init.c
View File

@ -719,7 +719,7 @@ const char* _glfwPlatformGetVersionString(void)
#if defined(_POSIX_TIMERS) && defined(_POSIX_MONOTONIC_CLOCK) #if defined(_POSIX_TIMERS) && defined(_POSIX_MONOTONIC_CLOCK)
" clock_gettime" " clock_gettime"
#endif #endif
#if defined(_GLFW_HAS_LINUX_JOYSTICKS) #if defined(__linux__)
" Linux-joystick-API" " Linux-joystick-API"
#else #else
" no-joystick-support" " no-joystick-support"

20
src/x11_joystick.c
View File

@ -30,7 +30,7 @@
#include "internal.h" #include "internal.h"
#ifdef _GLFW_HAS_LINUX_JOYSTICKS #ifdef __linux__
#include <linux/joystick.h> #include <linux/joystick.h>
#include <sys/types.h> #include <sys/types.h>
@ -41,7 +41,7 @@
#include <dirent.h> #include <dirent.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#endif // _GLFW_HAS_LINUX_JOYSTICKS #endif // __linux__
//======================================================================== //========================================================================
@ -50,7 +50,7 @@
static int openJoystickDevice(int joy, const char* path) static int openJoystickDevice(int joy, const char* path)
{ {
#ifdef _GLFW_HAS_LINUX_JOYSTICKS #ifdef __linux__
char numAxes, numButtons; char numAxes, numButtons;
int fd, version; int fd, version;
@ -97,7 +97,7 @@ static int openJoystickDevice(int joy, const char* path)
} }
_glfwLibrary.X11.joystick[joy].present = GL_TRUE; _glfwLibrary.X11.joystick[joy].present = GL_TRUE;
#endif // _GLFW_HAS_LINUX_JOYSTICKS #endif // __linux__
return GL_TRUE; return GL_TRUE;
} }
@ -109,7 +109,7 @@ static int openJoystickDevice(int joy, const char* path)
static void pollJoystickEvents(void) static void pollJoystickEvents(void)
{ {
#ifdef _GLFW_HAS_LINUX_JOYSTICKS #ifdef __linux__
int i; int i;
ssize_t result; ssize_t result;
struct js_event e; struct js_event e;
@ -160,7 +160,7 @@ static void pollJoystickEvents(void)
} }
} }
} }
#endif // _GLFW_HAS_LINUX_JOYSTICKS #endif // __linux__
} }
@ -174,7 +174,7 @@ static void pollJoystickEvents(void)
int _glfwInitJoysticks(void) int _glfwInitJoysticks(void)
{ {
#ifdef _GLFW_HAS_LINUX_JOYSTICKS #ifdef __linux__
int i, joy = 0; int i, joy = 0;
regex_t regex; regex_t regex;
DIR* dir; DIR* dir;
@ -215,7 +215,7 @@ int _glfwInitJoysticks(void)
} }
regfree(&regex); regfree(&regex);
#endif // _GLFW_HAS_LINUX_JOYSTICKS #endif // __linux__
return GL_TRUE; return GL_TRUE;
} }
@ -227,7 +227,7 @@ int _glfwInitJoysticks(void)
void _glfwTerminateJoysticks(void) void _glfwTerminateJoysticks(void)
{ {
#ifdef _GLFW_HAS_LINUX_JOYSTICKS #ifdef __linux__
int i; int i;
for (i = 0; i <= GLFW_JOYSTICK_LAST; i++) for (i = 0; i <= GLFW_JOYSTICK_LAST; i++)
@ -241,7 +241,7 @@ void _glfwTerminateJoysticks(void)
_glfwLibrary.X11.joystick[i].present = GL_FALSE; _glfwLibrary.X11.joystick[i].present = GL_FALSE;
} }
} }
#endif // _GLFW_HAS_LINUX_JOYSTICKS #endif // __linux__
} }