X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fgamegl.h;h=fc062c053e57cf9e65bd7906af59dad2acb09051;hb=1aef858f5ecb3dc8fd816e0155635371ed3632f2;hp=20d94ce125d9799cc2c84c6a1ecb9afe411f1991;hpb=79b5064ce9bf996395b8605691b09bcdbf503d2a;p=lugaru.git diff --git a/Source/gamegl.h b/Source/gamegl.h index 20d94ce..fc062c0 100644 --- a/Source/gamegl.h +++ b/Source/gamegl.h @@ -30,42 +30,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include -#ifndef WIN32 - #if PLATFORM_UNIX - #define GL_GLEXT_PROTOTYPES - #include "GL/gl.h" - #include "GL/glu.h" - #include "GL/glext.h" - #else - #include - #include - #include - #endif -#else +#ifdef WIN32 #define WIN32_LEAN_AND_MEAN #define Polygon WinPolygon #include #undef Polygon - #define GL_GLEXT_PROTOTYPES - #include - #include - //#include -- EVIL and OLD, NEVER USE IT! - #include - #include "MacCompatibility.h" - //#include "il/ilut.h" - #endif -#if !PLATFORM_MACOSX -struct RGBColor -{ - unsigned short red; - unsigned short green; - unsigned short blue; -}; -typedef struct RGBColor RGBColor; -typedef RGBColor * RGBColorPtr; -#endif +#define GL_GLEXT_PROTOTYPES 1 +#include "GL/gl.h" +#include "GL/glu.h" +#include "GL/glext.h" +#include "MacCompatibility.h" using namespace std;