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:
parent
ccfdd2eb5f
commit
488cd6ed75
@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
#include <GL/freeglut.h>
|
||||
#include "freeglut_internal_mswin.h"
|
||||
#include "../Common/freeglut_internal.h"
|
||||
|
||||
|
||||
|
||||
|
@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
#include <GL/freeglut.h>
|
||||
#include "freeglut_internal_mswin.h"
|
||||
#include "../Common/freeglut_internal.h"
|
||||
|
||||
GLUTproc fgPlatformGlutGetProcAddress( const char* procName )
|
||||
{
|
||||
|
@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
#include <GL/freeglut.h>
|
||||
#include "freeglut_internal_mswin.h"
|
||||
#include "../Common/freeglut_internal.h"
|
||||
|
||||
/*
|
||||
* Remembers the current visual settings, so that
|
||||
|
@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
#include <GL/freeglut.h>
|
||||
#include "freeglut_internal_mswin.h"
|
||||
#include "../Common/freeglut_internal.h"
|
||||
|
||||
|
||||
|
||||
|
@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
#include <GL/freeglut.h>
|
||||
#include "freeglut_internal_mswin.h"
|
||||
#include "../Common/freeglut_internal.h"
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <winbase.h>
|
||||
|
@ -30,7 +30,5 @@
|
||||
|
||||
|
||||
|
||||
#include "..\Common\freeglut_internal.h"
|
||||
|
||||
|
||||
#endif /* FREEGLUT_INTERNAL_MSWIN_H */
|
@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
#include <GL/freeglut.h>
|
||||
#include "freeglut_internal_mswin.h"
|
||||
#include "../Common/freeglut_internal.h"
|
||||
|
||||
|
||||
extern void fghRedrawWindow ( SFG_Window *window );
|
||||
|
@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
#include <GL/freeglut.h>
|
||||
#include "freeglut_internal_mswin.h"
|
||||
#include "../Common/freeglut_internal.h"
|
||||
|
||||
|
||||
GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
|
||||
|
@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
#include <GL/freeglut.h>
|
||||
#include "freeglut_internal_mswin.h"
|
||||
#include "../Common/freeglut_internal.h"
|
||||
|
||||
|
||||
extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,
|
||||
|
@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
#include <GL/freeglut.h>
|
||||
#include "freeglut_internal_mswin.h"
|
||||
#include "../Common/freeglut_internal.h"
|
||||
|
||||
|
||||
void fgPlatformCreateWindow ( SFG_Window *window )
|
||||
|
@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
#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:
|
||||
|
Reference in New Issue
Block a user