Fixing the previous commit so we don't have a circular include. Under the new regime, the "freeglut_internal_mswin.h(platform).h" file will have only platform-specific definitions in it and will be included at the top of "freeglut_internal.h".

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1010 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-01-29 02:29:16 +00:00
parent ccfdd2eb5f
commit 488cd6ed75
11 changed files with 10 additions and 12 deletions

View File

@ -26,7 +26,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal_mswin.h" #include "../Common/freeglut_internal.h"

View File

@ -26,7 +26,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal_mswin.h" #include "../Common/freeglut_internal.h"
GLUTproc fgPlatformGlutGetProcAddress( const char* procName ) GLUTproc fgPlatformGlutGetProcAddress( const char* procName )
{ {

View File

@ -26,7 +26,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal_mswin.h" #include "../Common/freeglut_internal.h"
/* /*
* Remembers the current visual settings, so that * Remembers the current visual settings, so that

View File

@ -26,7 +26,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal_mswin.h" #include "../Common/freeglut_internal.h"

View File

@ -26,7 +26,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal_mswin.h" #include "../Common/freeglut_internal.h"
#include <sys/types.h> #include <sys/types.h>
#include <winbase.h> #include <winbase.h>

View File

@ -30,7 +30,5 @@
#include "..\Common\freeglut_internal.h"
#endif /* FREEGLUT_INTERNAL_MSWIN_H */ #endif /* FREEGLUT_INTERNAL_MSWIN_H */

View File

@ -26,7 +26,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal_mswin.h" #include "../Common/freeglut_internal.h"
extern void fghRedrawWindow ( SFG_Window *window ); extern void fghRedrawWindow ( SFG_Window *window );

View File

@ -26,7 +26,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal_mswin.h" #include "../Common/freeglut_internal.h"
GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y ) GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )

View File

@ -26,7 +26,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal_mswin.h" #include "../Common/freeglut_internal.h"
extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,

View File

@ -26,7 +26,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal_mswin.h" #include "../Common/freeglut_internal.h"
void fgPlatformCreateWindow ( SFG_Window *window ) void fgPlatformCreateWindow ( SFG_Window *window )

View File

@ -26,7 +26,7 @@
*/ */
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "freeglut_internal_mswin.h" #include "../Common/freeglut_internal.h"
/* The following include file is available from SGI but is not standard: /* The following include file is available from SGI but is not standard: