projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix more compiler warnings
[freeglut]
/
src
/
fg_init.c
diff --git
a/src/fg_init.c
b/src/fg_init.c
index
816fc66
..
1e71931
100644
(file)
--- a/
src/fg_init.c
+++ b/
src/fg_init.c
@@
-28,6
+28,7
@@
#define FREEGLUT_BUILDING_LIB
#include <GL/freeglut.h>
#include "fg_internal.h"
#define FREEGLUT_BUILDING_LIB
#include <GL/freeglut.h>
#include "fg_internal.h"
+#include "fg_gl2.h"
/*
* TODO BEFORE THE STABLE RELEASE:
/*
* TODO BEFORE THE STABLE RELEASE:
@@
-85,10
+86,12
@@
SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */
0, /* MouseWheelTicks */
1, /* AuxiliaryBufferNumber */
4, /* SampleNumber */
0, /* MouseWheelTicks */
1, /* AuxiliaryBufferNumber */
4, /* SampleNumber */
- 1, /* MajorVersion */
- 0, /* MinorVersion */
- 0, /* ContextFlags */
- 0, /* ContextProfile */
+ GL_FALSE, /* SkipStaleMotion */
+ 1, /* OpenGL context MajorVersion */
+ 0, /* OpenGL context MinorVersion */
+ 0, /* OpenGL ContextFlags */
+ 0, /* OpenGL ContextProfile */
+ 0, /* HasOpenGL20 */
NULL, /* ErrorFunc */
NULL /* WarningFunc */
};
NULL, /* ErrorFunc */
NULL /* WarningFunc */
};
@@
-101,7
+104,6
@@
extern void fgPlatformDeinitialiseInputDevices ( void );
extern void fgPlatformCloseDisplay ( void );
extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
extern void fgPlatformCloseDisplay ( void );
extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
-
void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
{
#ifndef _WIN32_WCE
void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
{
#ifndef _WIN32_WCE
@@
-315,7
+317,7
@@
void fgDeinitialize( void )
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
/* -- INTERFACE FUNCTIONS -------------------------------------------------- */
-#if !TARGET_HOST_POSIX_X11
+#if defined(NEED_XPARSEGEOMETRY_IMPL)
# include "util/xparsegeometry_repl.h"
#endif
# include "util/xparsegeometry_repl.h"
#endif
@@
-379,6
+381,8
@@
void FGAPIENTRY glutInit( int* pargc, char** argv )
if( (mask & (XValue|YValue)) == (XValue|YValue) )
fgState.Position.Use = GL_TRUE;
}
if( (mask & (XValue|YValue)) == (XValue|YValue) )
fgState.Position.Use = GL_TRUE;
}
+
+ fgInitGL2();
}
/*
}
/*
@@
-682,4
+686,4
@@
void FGAPIENTRY glutInitWarningFunc( void (* vfgWarning) ( const char *fmt, va_l
fgState.WarningFunc = vfgWarning;
}
fgState.WarningFunc = vfgWarning;
}
-/*** END OF FILE ***/
\ No newline at end of file
+/*** END OF FILE ***/