X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fgamegl.h;h=e6823615fdbe9e82094d816305f886aec343d394;hb=decb00e82a2e65e25dbcdd8f16fff5a6a07d31d6;hp=1479e4b4ebf616f9152f9fbf36f0bcd9cfc29893;hpb=43f08119f2408a487dbefcf670bb6c8f47d4c49b;p=lugaru.git

diff --git a/Source/gamegl.h b/Source/gamegl.h
index 1479e4b..e682361 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_
 
@@ -9,33 +30,19 @@
 #include <map>
 #include <string>
 
-#ifndef WIN32
-  #if PLATFORM_LINUX
-    #define GL_GLEXT_PROTOTYPES
-    #include "gl.h"
-    #include "glu.h"
-    #include "glext.h"
-  #else
-    #include <gl.h>
-    #include <glu.h>
-    #include <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
 
+#define GL_GLEXT_PROTOTYPES 1
+#include "GL/gl.h"
+#include "GL/glu.h"
+#include "GL/glext.h"
+#include "MacCompatibility.h"
+
 #if !PLATFORM_MACOSX
 struct RGBColor
 {
@@ -49,7 +56,9 @@ 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