Merge branch 'ehofman/particles' into next

[simgear.git] / simgear / screen / GLBitmaps.cxx

diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx
index 0e9544ce70df3a43b3f7b5c1f1b3dfadc00de30b..30b6e12b1eabde076492c29e2b8c5f935233ba85 100755 (executable)
--- a/simgear/screen/GLBitmaps.cxx
+++ b/simgear/screen/GLBitmaps.cxx
@@ -2,8 +2,8 @@
 #  include <simgear_config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>                     
+#ifdef WIN32
+# include <windows.h>
 #endif
 
 #include <stdio.h>
@@ -11,9 +11,6 @@
 #include <limits.h>
 #include <string.h>            // memcpy()
 
-#include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
-
 #include "GLBitmaps.h"
 
 GlBitmap::GlBitmap( GLenum mode, GLint width, GLint height, GLubyte *bitmap )