mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 18:31:55 -04:00
hmm, contradictory requirements for placement of glgsg.h
This commit is contained in:
parent
4f25076252
commit
239676ffd6
@ -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
|
||||
// namescope conflict between them and some other header file that
|
||||
// gets included later (in particular, TCP_NODELAY must not be a
|
||||
@ -24,6 +20,11 @@
|
||||
#include <OpenGL/gl.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 "config_osxdisplay.h"
|
||||
#include "osxGraphicsPipe.h"
|
||||
|
Loading…
x
Reference in New Issue
Block a user