X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2Fgamegl.h;h=9bee196a0f3e51f3106dab8ab5d6f47552f2e78d;hb=8a32dc9e4e1011b10f009e999d7d008aa2711d8a;hp=20d94ce125d9799cc2c84c6a1ecb9afe411f1991;hpb=fdbfc61e2834e189b0e903b981094c046b1862a0;p=lugaru.git diff --git a/Source/gamegl.h b/Source/gamegl.h index 20d94ce..9bee196 100644 --- a/Source/gamegl.h +++ b/Source/gamegl.h @@ -1,22 +1,21 @@ /* Copyright (C) 2003, 2010 - Wolfire Games +Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) 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. +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, +Lugaru 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. +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. +along with Lugaru. If not, see . */ #ifndef _LUGARU_GL_H_ @@ -30,42 +29,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;