projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Splitting out the platform-specific code from "fghJoystickInit"
[freeglut]
/
src
/
mswin
/
freeglut_state_mswin.c
diff --git
a/src/mswin/freeglut_state_mswin.c
b/src/mswin/freeglut_state_mswin.c
index
8a67c4b
..
1f9966b
100644
(file)
--- a/
src/mswin/freeglut_state_mswin.c
+++ b/
src/mswin/freeglut_state_mswin.c
@@
-26,7
+26,7
@@
*/
\r
\r
#include <GL/freeglut.h>
\r
*/
\r
\r
#include <GL/freeglut.h>
\r
-#include "freeglut_internal_mswin.h"
\r
+#include "../Common/freeglut_internal.h"
\r
\r
\r
extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
\r
\r
\r
extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
\r
@@
-229,7
+229,7
@@
int fgPlatformGlutGet ( GLenum eWhat )
case GLUT_WINDOW_FORMAT_ID:
\r
#if !defined(_WIN32_WCE)
\r
if( fgStructure.CurrentWindow != NULL )
\r
case GLUT_WINDOW_FORMAT_ID:
\r
#if !defined(_WIN32_WCE)
\r
if( fgStructure.CurrentWindow != NULL )
\r
- return GetPixelFormat( fgStructure.CurrentWindow->Window.Device );
\r
+ return GetPixelFormat( fgStructure.CurrentWindow->Window.pContext.Device );
\r
#endif /* defined(_WIN32_WCE) */
\r
return 0;
\r
\r
#endif /* defined(_WIN32_WCE) */
\r
return 0;
\r
\r