FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving the Windows-specific joystick definitions into the Windows-specific header file

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1026 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-01-29 05:26:54 +00:00
parent ce296d938e
commit 7a945281b1
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
freeglut/freeglut/src/Common/freeglut_internal.h
View File

@ -813,17 +813,6 @@ struct tagSFG_PlatformJoystick
}; };
#endif #endif
#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
# define _JS_MAX_AXES 8
typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
struct tagSFG_PlatformJoystick
{
JOYCAPS jsCaps;
JOYINFOEX js;
UINT js_id;
};
#endif
#if TARGET_HOST_POSIX_X11 #if TARGET_HOST_POSIX_X11
# define _JS_MAX_AXES 16 # define _JS_MAX_AXES 16
typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick; typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;

14
freeglut/freeglut/src/mswin/freeglut_internal_mswin.h
View File

@ -49,6 +49,20 @@ struct tagSFG_PlatformContext
}; };
/* Joystick-Specific Definitions */
#if !defined(_WIN32_WCE)
# define _JS_MAX_AXES 8
typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
struct tagSFG_PlatformJoystick
{
JOYCAPS jsCaps;
JOYINFOEX js;
UINT js_id;
};
#endif
/* Function to be called on exit */ /* Function to be called on exit */
extern void (__cdecl *__glutExitFunc)( int return_value ); extern void (__cdecl *__glutExitFunc)( int return_value );