projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allowing compilation of Windows version by removing DLL decorations from deprecated...
[freeglut]
/
src
/
freeglut_internal.h
diff --git
a/src/freeglut_internal.h
b/src/freeglut_internal.h
index
9353ad9
..
c2fa064
100644
(file)
--- a/
src/freeglut_internal.h
+++ b/
src/freeglut_internal.h
@@
-42,7
+42,7
@@
# define TARGET_HOST_UNIX_X11 0
# define TARGET_HOST_WIN32 0
# define TARGET_HOST_WINCE 1
# define TARGET_HOST_UNIX_X11 0
# define TARGET_HOST_WIN32 0
# define TARGET_HOST_WINCE 1
-#elif defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)
+#elif defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__WATCOMC__)
# define TARGET_HOST_UNIX_X11 0
# define TARGET_HOST_WIN32 1
# define TARGET_HOST_WINCE 0
# define TARGET_HOST_UNIX_X11 0
# define TARGET_HOST_WIN32 1
# define TARGET_HOST_WINCE 0
@@
-73,7
+73,7
@@
LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
#endif
#endif
#endif
#endif
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) || defined(__WATCOMC__)
#define strdup _strdup
#endif
#define strdup _strdup
#endif
@@
-126,6
+126,8
@@
LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
# define FALSE 0
#endif
# define FALSE 0
#endif
+#define INVALID_MODIFIERS 0xffffffff
+
/* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */
/* Freeglut callbacks type definitions */
/* -- GLOBAL TYPE DEFINITIONS ---------------------------------------------- */
/* Freeglut callbacks type definitions */
@@
-512,10
+514,10
@@
typedef struct tagSFG_MenuContext SFG_MenuContext;
struct tagSFG_MenuContext
{
#if TARGET_HOST_UNIX_X11
struct tagSFG_MenuContext
{
#if TARGET_HOST_UNIX_X11
- XVisualInfo* VisualInfo; /* The window's visual information */
+ XVisualInfo* MVisualInfo; /* The window's visual information */
#endif
#endif
- SFG_WindowContextType Context; /* The menu window's WGL context */
+ SFG_WindowContextType MContext; /* The menu window's WGL context */
};
/* This structure describes a menu */
};
/* This structure describes a menu */
@@
-779,12
+781,7
@@
void fgInitialiseJoysticks( void );
void fgJoystickClose( void );
void fgJoystickPollWindow( SFG_Window* window );
void fgJoystickClose( void );
void fgJoystickPollWindow( SFG_Window* window );
-/* More joystick functions. Should these go into the API? */
-int glutJoystickGetNumAxes( int ident );
-int glutJoystickGetNumButtons( int ident );
-int glutJoystickNotWorking( int ident );
-
-/* InputDevice Init/Fini */
+/* InputDevice Initialisation and Closure */
int fgInputDeviceDetect( void );
void fgInitialiseInputDevices( void );
void fgInputDeviceClose( void );
int fgInputDeviceDetect( void );
void fgInitialiseInputDevices( void );
void fgInputDeviceClose( void );