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

[simgear.git] / simgear / xgl / xgl.c

diff --git a/simgear/xgl/xgl.c b/simgear/xgl/xgl.c
index 653805240e350521569408ddc8b60d5f0e814469..2e7119575796041068e1563b8e6f7296896e3b42 100644 (file)
--- a/simgear/xgl/xgl.c
+++ b/simgear/xgl/xgl.c
@@ -1,13 +1,12 @@
 #ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-#ifdef HAVE_WINDOWS_H
-#  include <windows.h>
+#  include <simgear_config.h>
 #endif
 
 #include "xgl.h"
-#include <GL/glut.h>
+
+#ifdef USING_GLUT
+#include GLUT_H
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -2729,6 +2728,7 @@ void xglViewport ( GLint x, GLint y, GLsizei width, GLsizei height )
     glViewport ( x, y, width, height ) ;
 }
 
+#ifdef USING_GLUT
 void xglutAddMenuEntry ( char* label, int value )
 {
   if ( xglTraceIsEnabled("glutAddMenuEntry") )
@@ -2864,6 +2864,7 @@ void xglutSwapBuffers ()
   if ( xglExecuteIsEnabled("glutSwapBuffers") )
     glutSwapBuffers () ;
 }
+#endif
 
 GLboolean xglAreTexturesResidentEXT ( GLsizei n, GLuint* textures, GLboolean* residences )
 {