pietoaster: Clean up OpenGL includes. Include SDL_opengl.h instead of gl.h - do not

use both. Fixes warnings.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3175 4a71c877-e1ca-e34f-864e-861f7616d084

tools/pietoaster/pie_internal.cpp

@@ -19,11 +19,7 @@
  */
 #include "pie_internal.h"
 
-#ifdef _WIN32
-	#include <windows.h>	// required by gl.h
-#endif
-#include <GL/gl.h>
-#include <GL/glu.h>
+#include <SDL_opengl.h>
 
 #include "screen.h"
 #include "game_io.h"

tools/pietoaster/pietoaster.cpp

@@ -24,11 +24,7 @@
 #include "SDL.h"
 #include "AntTweakBar.h"
 
-#ifdef _WIN32
-	#include <windows.h>	// required by gl.h
-#endif
-#include <GL/gl.h>
-#include <GL/glu.h>
+#include <SDL_opengl.h>
 
 #include "pie_types.h"
 #include "imdloader.h"

tools/pietoaster/resmaster.cpp

@@ -19,11 +19,6 @@
  */
 #include "resmaster.h"
 
-#ifdef _WIN32
-# include <windows.h>	// required by gl.h
-#endif
-#include <GL/gl.h>
-#include <GL/glu.h>
 #include <SDL_opengl.h>
 #include <SDL_image.h>
 

tools/pietoaster/resmaster.h

@@ -20,11 +20,7 @@
 #ifndef _resmaster_h
 #define _resmaster_h
 
-#ifdef _WIN32
-	#include <windows.h>	// required by gl.h
-#endif
-#include <GL/gl.h>
-#include <GL/glu.h>
+#include <SDL_opengl.h>
 
 #include "wzglobal.h"
 #include "pie_types.h"

tools/pietoaster/screen.h

@@ -20,12 +20,6 @@
 #ifndef _screen_h
 #define _screen_h
 
-#ifdef _WIN32
-	#include <windows.h>	// required by gl.h
-#endif
-#include <GL/gl.h>
-#include <GL/glu.h>
-
 #include <SDL_opengl.h>
 
 #include "wzglobal.h"

tools/pietoaster/texture_mapper.h

@@ -21,12 +21,6 @@
 #ifndef _texture_mapper_h
 #define _texture_mapper_h
 
-#ifdef _WIN32
-	#include <windows.h>	// required by gl.h
-#endif
-#include <GL/gl.h>
-#include <GL/glu.h>
-
 #include "wzglobal.h"
 #include "pie_types.h"