Oops, ALUT 1.0 requires a little more work than expected.

[simgear.git] / simgear / xgl / xgl.h

diff --git a/simgear/xgl/xgl.h b/simgear/xgl/xgl.h
index 366cf4796d16ba4036cbccd56084dc2657631864..bb3712477e09f9b423ba86a48cd0dc4d50de100b 100644 (file)
--- a/simgear/xgl/xgl.h
+++ b/simgear/xgl/xgl.h
@@ -6,12 +6,18 @@
 #  include <simgear_config.h>
 #endif
 
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
+#if defined(__CYGWIN__)  /* && !defined(USING_X) */
+#define WIN32
 #endif
 
-#include <GL/gl.h>
-#include <GL/glu.h>
+#if defined(WIN32)  /* MINGW and MSC predefine WIN32 */
+# include <windows.h>
+#endif
+
+#include <simgear/compiler.h>
+#include SG_GLU_H
+#include SG_GL_H
+
 #include <stdio.h>