Change SGPath::exists to use stat(), fix '.' and '..' handling on Windows, add simgea...

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

diff --git a/simgear/screen/GLBitmaps.cxx b/simgear/screen/GLBitmaps.cxx
index a490a4d0bdc3ff4262bee9b079c1093e98406d5b..30b6e12b1eabde076492c29e2b8c5f935233ba85 100755 (executable)
--- a/simgear/screen/GLBitmaps.cxx
+++ b/simgear/screen/GLBitmaps.cxx
@@ -2,11 +2,7 @@
 #  include <simgear_config.h>
 #endif
 
-#if defined(__CYGWIN__)  /* && !defined(USING_X) */
-#define WIN32
-#endif
-
-#if defined(WIN32)  /* MINGW and MSC predefine WIN32 */
+#ifdef WIN32
 # include <windows.h>
 #endif
 
@@ -15,10 +11,6 @@
 #include <limits.h>
 #include <string.h>            // memcpy()
 
-#include <simgear/compiler.h>
-
-#include SG_GL_H
-
 #include "GLBitmaps.h"
 
 GlBitmap::GlBitmap( GLenum mode, GLint width, GLint height, GLubyte *bitmap )