TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 19:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

hmm, contradictory requirements for placement of glgsg.h

Browse Source
This commit is contained in:
David Rose 2009-11-04 19:13:39 +00:00
parent 4f25076252
commit 239676ffd6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/osxdisplay/osxGraphicsWindow.mm
View File

@ -9,10 +9,6 @@
// //
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// We have to include this before we include the system OpenGL/gl.h
// file.
#include "glgsg.h"
// We include these system header files first, because there is a // We include these system header files first, because there is a
// namescope conflict between them and some other header file that // namescope conflict between them and some other header file that
// gets included later (in particular, TCP_NODELAY must not be a // gets included later (in particular, TCP_NODELAY must not be a
@ -24,6 +20,11 @@
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <AGL/agl.h> #include <AGL/agl.h>
// We have to include this before we include the system OpenGL/gl.h
// file, but after we include all of the above header files. Deal
// with this contradiction later.
#include "glgsg.h"
#include "osxGraphicsWindow.h" #include "osxGraphicsWindow.h"
#include "config_osxdisplay.h" #include "config_osxdisplay.h"
#include "osxGraphicsPipe.h" #include "osxGraphicsPipe.h"