X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fgamegl.h;h=fc062c053e57cf9e65bd7906af59dad2acb09051;hb=1aef858f5ecb3dc8fd816e0155635371ed3632f2;hp=203cc4dd410d3e42bee8e8140c8f3b77c55ae122;hpb=8866bcf90dba64f2fd6cecd6839b9b80988e46a6;p=lugaru.git

diff --git a/Source/gamegl.h b/Source/gamegl.h
index 203cc4d..fc062c0 100644
--- a/Source/gamegl.h
+++ b/Source/gamegl.h
@@ -30,47 +30,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <map>
 #include <string>
 
-#ifndef WIN32
-  #if PLATFORM_UNIX
-    #define GL_GLEXT_PROTOTYPES
-    #include "GL/gl.h"
-    #include "GL/glu.h"
-    #include "GL/glext.h"
-  #else
-    #include <GL/gl.h>
-    #include <GL/glu.h>
-    #include <GL/glext.h>
-  #endif
-#else
+#ifdef WIN32
   #define WIN32_LEAN_AND_MEAN
   #define Polygon WinPolygon
   #include <windows.h>
   #undef Polygon
-  #define GL_GLEXT_PROTOTYPES
-  #include <gl/gl.h>
-  #include <gl/glu.h>
-  #include <gl/glaux.h>
-  #include <gl/glext.h>
-  #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;
 
-#include "logger/logger.h"
+/* !!! FIXME: until we replace logger better. --ryan. */
+#define LOGFUNC
+void LOG(const std::string &fmt, ...);
 
 #endif