X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fgamegl.h;h=fc062c053e57cf9e65bd7906af59dad2acb09051;hb=bbf8873b80baf3cb468ac12b3f62b0938320fef1;hp=482a21d31de33adbe136fc75690fd6772adf2928;hpb=5caf4edd361a27a3250fdbf5e8084b0d5c55d615;p=lugaru.git diff --git a/Source/gamegl.h b/Source/gamegl.h index 482a21d..fc062c0 100644 --- a/Source/gamegl.h +++ b/Source/gamegl.h @@ -30,43 +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" - - #define glDeleteTextures( a, b) glDeleteTextures( (a), (const unsigned int *)(b) ); #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;