X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fgamegl.h;h=20d94ce125d9799cc2c84c6a1ecb9afe411f1991;hb=2fea8aa4d67ff70b015a34eb058a5e598b3d737d;hp=bc36ba9ba99b8c7f2a2541316b765b51af81b3b8;hpb=8562aa5bebc97ea8a61d056aec3847030c6985b7;p=lugaru.git

diff --git a/Source/gamegl.h b/Source/gamegl.h
index bc36ba9..20d94ce 100644
--- a/Source/gamegl.h
+++ b/Source/gamegl.h
@@ -1,3 +1,24 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #ifndef _LUGARU_GL_H_
 #define _LUGARU_GL_H_
 
@@ -10,14 +31,15 @@
 #include <string>
 
 #ifndef WIN32
-  #if PLATFORM_LINUX
-    #include "gl.h"
-    #include "glu.h"
-    #include "glext.h"
+  #if PLATFORM_UNIX
+    #define GL_GLEXT_PROTOTYPES
+    #include "GL/gl.h"
+    #include "GL/glu.h"
+    #include "GL/glext.h"
   #else
-    #include <gl.h>
-    #include <glu.h>
-    #include <glext.h>
+    #include <GL/gl.h>
+    #include <GL/glu.h>
+    #include <GL/glext.h>
   #endif
 #else
   #define WIN32_LEAN_AND_MEAN
@@ -27,12 +49,11 @@
   #define GL_GLEXT_PROTOTYPES
   #include <gl/gl.h>
   #include <gl/glu.h>
-  #include <gl/glaux.h>
+  //#include <gl/glaux.h> -- EVIL and OLD, NEVER USE IT!
   #include <gl/glext.h>
-  #include "WinDefs.h"
-  #include "il/ilut.h"
+  #include "MacCompatibility.h"
+  //#include "il/ilut.h"
 
-  #define glDeleteTextures( a, b) glDeleteTextures( (a), (const unsigned int *)(b) );
 #endif
 
 #if !PLATFORM_MACOSX
@@ -48,7 +69,10 @@ typedef RGBColor * RGBColorPtr;
 
 using namespace std;
 
-#include "logger/logger.h"
+/* !!! FIXME: until we replace logger better. --ryan. */
+#define LOGFUNC
+void LOG(const std::string &fmt, ...);
 
 #endif
 
+