Modifications to coordinate with recent changes in simgear.

diff --git a/src/Cockpit/cockpit.cxx b/src/Cockpit/cockpit.cxx
index b0b6651b1f424759b1ce5debbee248e2f4233bdf..c17a9b75477767a0a1ce1abdef1519337db4a7b3 100644 (file)
--- a/src/Cockpit/cockpit.cxx
+++ b/src/Cockpit/cockpit.cxx
@@ -30,7 +30,6 @@
 #endif
 
 #include <GL/glut.h>
-// #include <simgear/xgl/xgl.h>
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/src/GUI/apt_dlg.cxx b/src/GUI/apt_dlg.cxx
index 49e3336d2fc1dd10adb9f6a01528ecca5bcfd08a..5b890dc40c3a1faded219cba19687a326ff13169 100644 (file)
--- a/src/GUI/apt_dlg.cxx
+++ b/src/GUI/apt_dlg.cxx
@@ -17,7 +17,7 @@
 #include <Include/general.hxx>
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <Airports/simple.hxx>
 #include <FDM/flight.hxx>

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index db0b9f347dedf3a471363022c55f1ea3c42cbd52..a0916ca59aa066aa07b4ee14cb5792f583e626ff 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -39,7 +39,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #if defined(FX) && defined(XMESA)
 #  include <GL/xmesa.h>

diff --git a/src/GUI/mouse.cxx b/src/GUI/mouse.cxx
index bbaf0164df70345f8ff7540ef2b8a56a81bc6568..4b435b297e452a844339d38b0820eb9ad48d1d9d 100644 (file)
--- a/src/GUI/mouse.cxx
+++ b/src/GUI/mouse.cxx
@@ -39,7 +39,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #if defined(FX) && defined(XMESA)
 #  include <GL/xmesa.h>

diff --git a/src/GUI/net_dlg.cxx b/src/GUI/net_dlg.cxx
index bc8a6a4b3157e71a2a5f4a5c327c07574bfe31dd..0aea38dcd3b0f4d83202f3e56b1b6bbb88a9b5ed 100644 (file)
--- a/src/GUI/net_dlg.cxx
+++ b/src/GUI/net_dlg.cxx
@@ -36,7 +36,7 @@
 #include <simgear/misc/sg_path.hxx>
 
 #include <Include/general.hxx>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>

diff --git a/src/Main/keyboard.cxx b/src/Main/keyboard.cxx
index b1dea16f02e79162da014d8a654d752043d2ee37..51ae40a7c9a47384d31e2d1e495305332b7d18fc 100644 (file)
--- a/src/Main/keyboard.cxx
+++ b/src/Main/keyboard.cxx
@@ -32,7 +32,7 @@
 #include <simgear/compiler.h>
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #if defined(FX) && defined(XMESA)
 #include <GL/xmesa.h>

diff --git a/src/Main/keyboard.hxx b/src/Main/keyboard.hxx
index 6602888f9e5f998c5e1b275ab138ff2894735b7c..a07745841656f0e57ea118ad5b0d13950ff777c4 100644 (file)
--- a/src/Main/keyboard.hxx
+++ b/src/Main/keyboard.hxx
@@ -39,7 +39,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 
 // Handle keyboard events

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index 685f5db0b90e4143546ee03454a96f66cc07201a..07369723f8a0dc508e3cf2a7bc7d63df4ebf2323 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -35,7 +35,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/src/Main/splash.cxx b/src/Main/splash.cxx
index f2be9494582caeb3c0be04fd76c3674556fe0534..092a3d3714f933b811159d1758bf940545eae71e 100644 (file)
--- a/src/Main/splash.cxx
+++ b/src/Main/splash.cxx
@@ -35,7 +35,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <string.h>
 
@@ -60,19 +60,19 @@ void fgSplashInit ( void ) {
 
     SG_LOG( SG_GENERAL, SG_INFO, "Initializing splash screen" );
 #ifdef GL_VERSION_1_1
-    xglGenTextures(1, &splash_texid);
-    xglBindTexture(GL_TEXTURE_2D, splash_texid);
+    glGenTextures(1, &splash_texid);
+    glBindTexture(GL_TEXTURE_2D, splash_texid);
 #elif GL_EXT_texture_object
-    xglGenTexturesEXT(1, &splash_texid);
-    xglBindTextureEXT(GL_TEXTURE_2D, splash_texid);
+    glGenTexturesEXT(1, &splash_texid);
+    glBindTextureEXT(GL_TEXTURE_2D, splash_texid);
 #else
 #  error port me
 #endif
 
-    xglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-    xglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);   
-    xglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-    xglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);   
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 
     // load in the texture data
     int num = (int)(sg_random() * 4.0 + 1.0);
@@ -99,7 +99,7 @@ void fgSplashInit ( void ) {
        } 
     } 
 
-    xglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, 
+    glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, 
                   GL_UNSIGNED_BYTE, (GLvoid *)(splash_texbuf) );
 }
 
@@ -122,48 +122,48 @@ void fgSplashUpdate ( double progress ) {
     ymax = ymin + ysize;
 
     // first clear the screen;
-    xglClearColor(0.0, 0.0, 0.0, 1.0);
-    xglClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT );
+    glClearColor(0.0, 0.0, 0.0, 1.0);
+    glClear( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT );
 
     // now draw the logo
-    xglMatrixMode(GL_PROJECTION);
-    xglPushMatrix();
-    xglLoadIdentity();
+    glMatrixMode(GL_PROJECTION);
+    glPushMatrix();
+    glLoadIdentity();
     gluOrtho2D(0, fgGetInt("/sim/startup/xsize"),
               0, fgGetInt("/sim/startup/ysize"));
-    xglMatrixMode(GL_MODELVIEW);
-    xglPushMatrix();
-    xglLoadIdentity();
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glLoadIdentity();
 
-    xglDisable(GL_DEPTH_TEST);
-    xglDisable(GL_LIGHTING);
-    xglEnable(GL_TEXTURE_2D);
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_LIGHTING);
+    glEnable(GL_TEXTURE_2D);
 #ifdef GL_VERSION_1_1
-    xglBindTexture(GL_TEXTURE_2D, splash_texid);
+    glBindTexture(GL_TEXTURE_2D, splash_texid);
 #elif GL_EXT_texture_object
-    xglBindTextureEXT(GL_TEXTURE_2D, splash_texid);
+    glBindTextureEXT(GL_TEXTURE_2D, splash_texid);
 #else
 #  error port me
 #endif
-    xglTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
+    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
 
-    xglBegin(GL_POLYGON);
-    xglTexCoord2f(0.0, 0.0); glVertex2f(xmin, ymin);
-    xglTexCoord2f(1.0, 0.0); glVertex2f(xmax, ymin);
-    xglTexCoord2f(1.0, 1.0); glVertex2f(xmax, ymax);
-    xglTexCoord2f(0.0, 1.0); glVertex2f(xmin, ymax); 
-    xglEnd();
+    glBegin(GL_POLYGON);
+    glTexCoord2f(0.0, 0.0); glVertex2f(xmin, ymin);
+    glTexCoord2f(1.0, 0.0); glVertex2f(xmax, ymin);
+    glTexCoord2f(1.0, 1.0); glVertex2f(xmax, ymax);
+    glTexCoord2f(0.0, 1.0); glVertex2f(xmin, ymax); 
+    glEnd();
 
-    xglutSwapBuffers();
+    glutSwapBuffers();
 
-    xglEnable(GL_DEPTH_TEST);
-    xglEnable(GL_LIGHTING);
-    xglDisable(GL_TEXTURE_2D);
+    glEnable(GL_DEPTH_TEST);
+    glEnable(GL_LIGHTING);
+    glDisable(GL_TEXTURE_2D);
 
-    xglMatrixMode(GL_PROJECTION);
-    xglPopMatrix();
-    xglMatrixMode(GL_MODELVIEW);
-    xglPopMatrix();
+    glMatrixMode(GL_PROJECTION);
+    glPopMatrix();
+    glMatrixMode(GL_MODELVIEW);
+    glPopMatrix();
 }
 
 

diff --git a/src/Navaids/fix.hxx b/src/Navaids/fix.hxx
index 9a3cf431c31dc7085ea2ae1476f782efdb6474ac..3804fb4b286ce02c246c6e34f15bd5731eb72581 100644 (file)
--- a/src/Navaids/fix.hxx
+++ b/src/Navaids/fix.hxx
@@ -25,6 +25,10 @@
 #define _FG_FIX_HXX
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
 #include <simgear/misc/sgstream.hxx>
 

diff --git a/src/Navaids/fixlist.cxx b/src/Navaids/fixlist.cxx
index 5d57794a8d85ac09c0a93c5a39b719f02e695d94..55a083166f9d3737b72771c443ba007ea4624948 100644 (file)
--- a/src/Navaids/fixlist.cxx
+++ b/src/Navaids/fixlist.cxx
@@ -21,6 +21,10 @@
 // $Id$
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>

diff --git a/src/Navaids/ilslist.cxx b/src/Navaids/ilslist.cxx
index f91ec013645365fca1d6f01a0edc967e066c04ef..cf8c9e55fb22b6f56b92e5f968b34361bac76991 100644 (file)
--- a/src/Navaids/ilslist.cxx
+++ b/src/Navaids/ilslist.cxx
@@ -21,6 +21,10 @@
 // $Id$
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>

diff --git a/src/Navaids/mkrbeacons.hxx b/src/Navaids/mkrbeacons.hxx
index 0c0263197077b6003c1c588364dff496c28e5182..b573f7202601b859800f46604f1d8635b203fe8b 100644 (file)
--- a/src/Navaids/mkrbeacons.hxx
+++ b/src/Navaids/mkrbeacons.hxx
@@ -25,6 +25,10 @@
 #define _FG_MKRBEACON_HXX
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
 #include <simgear/misc/sg_path.hxx>
 

diff --git a/src/Navaids/navlist.cxx b/src/Navaids/navlist.cxx
index 35ac0d5c22253a539cd6ece60f4975381ef1aed3..0bfd42a69189ccc20646444761844814dfd74b2a 100644 (file)
--- a/src/Navaids/navlist.cxx
+++ b/src/Navaids/navlist.cxx
@@ -21,6 +21,10 @@
 // $Id$
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>

diff --git a/src/Objects/matlib.cxx b/src/Objects/matlib.cxx
index d199c747979a3d7f1c8cd004609b6ed13dd8147c..4fcc1bd5de79a3de4d287ec7f7098e2d2e9858c9 100644 (file)
--- a/src/Objects/matlib.cxx
+++ b/src/Objects/matlib.cxx
@@ -34,7 +34,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <simgear/compiler.h>
 

diff --git a/src/Objects/matlib.hxx b/src/Objects/matlib.hxx
index 5bc7543e0f5706416e1bd8d8b93a12c0b2c93a19..c63281b8b1a6004bd26e884de477e2e0fcbae973 100644 (file)
--- a/src/Objects/matlib.hxx
+++ b/src/Objects/matlib.hxx
@@ -40,7 +40,7 @@
 #include <simgear/compiler.h>
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include STL_STRING            // Standard C++ string library
 #include <map>                 // STL associative "array"

diff --git a/src/Scenery/hitlist.cxx b/src/Scenery/hitlist.cxx
index bb980823b5bb422b8d55b47dec055baa850b2879..027b4b15b19c86d9a3a1db107243339f45f9ff34 100644 (file)
--- a/src/Scenery/hitlist.cxx
+++ b/src/Scenery/hitlist.cxx
@@ -10,11 +10,11 @@
 #include <math.h>
 
 #include <GL/glut.h>
+#include <GL/gl.h>
 
 #include <simgear/constants.h>
 #include <simgear/sg_inlines.h>
 #include <simgear/math/vector.hxx>
-#include <simgear/xgl/xgl.h>
 
 #include "hitlist.hxx"
 

diff --git a/src/Scenery/newcache.cxx b/src/Scenery/newcache.cxx
index 9d480724334b9473c22fee1ebe6398e2fc09dd69..c347bdd556813461059fcdde20440ee1d067c336 100644 (file)
--- a/src/Scenery/newcache.cxx
+++ b/src/Scenery/newcache.cxx
@@ -30,7 +30,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <plib/ssg.h>          // plib include
 

diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx
index 4eea0869bc179fa7a9ef3e8e569ce39ea8cf9b63..b5a4406f0abf62202f4ba5539a6f6bcc0dbef6bb 100644 (file)
--- a/src/Scenery/scenery.cxx
+++ b/src/Scenery/scenery.cxx
@@ -30,7 +30,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/src/Scenery/tileentry.cxx b/src/Scenery/tileentry.cxx
index 1aad249ae8d410f62ba4779c99463daa7fac9b7b..187bea011b6ec08ea5c5153fae4ef60a50a2be11 100644 (file)
--- a/src/Scenery/tileentry.cxx
+++ b/src/Scenery/tileentry.cxx
@@ -21,6 +21,10 @@
 // $Id$
 
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
 
 #ifdef SG_MATH_EXCEPTION_CLASH

diff --git a/src/Scenery/tileentry.hxx b/src/Scenery/tileentry.hxx
index a34426b3a4497e46104013e4afe4adfdf23f4b89..53a7f390094ea593ae8c21a0c04d086b610ac263 100644 (file)
--- a/src/Scenery/tileentry.hxx
+++ b/src/Scenery/tileentry.hxx
@@ -38,7 +38,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <simgear/compiler.h>
 

diff --git a/src/Time/light.cxx b/src/Time/light.cxx
index 1759399987dbf56811295c29a46255a6b0b27668..7202a3670849c1c3d8e67dee1effee508deb13d2 100644 (file)
--- a/src/Time/light.cxx
+++ b/src/Time/light.cxx
@@ -31,7 +31,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <simgear/compiler.h>
 

diff --git a/src/Time/light.hxx b/src/Time/light.hxx
index fd760a972fb754368e5144f7b6623f6fc28f271b..b1dd41ab853912197fe253ab9a774ff059267b94 100644 (file)
--- a/src/Time/light.hxx
+++ b/src/Time/light.hxx
@@ -39,7 +39,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <plib/sg.h>                   // plib include
 

diff --git a/src/Weather/weather.cxx b/src/Weather/weather.cxx
index ac703dd1ac910a44473a4b5e997d3c06b7f973bb..178ab4134b3cf6fc9fc9a96af116fb9cdee9d6cb 100644 (file)
--- a/src/Weather/weather.cxx
+++ b/src/Weather/weather.cxx
@@ -30,7 +30,7 @@
 #endif
 
 #include <GL/glut.h>
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #include <math.h>
 

diff --git a/src/Weather/weather.hxx b/src/Weather/weather.hxx
index 03e5714f28e1819b0b8cbdf7ac72f235d8f47a88..a1ee77b513a16727e3cd8e17db69b64fbb5097b8 100644 (file)
--- a/src/Weather/weather.hxx
+++ b/src/Weather/weather.hxx
@@ -27,7 +27,7 @@
 
 #include <simgear/compiler.h>
 
-#include <simgear/xgl/xgl.h>
+#include <GL/gl.h>
 
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <cmath>

diff --git a/src/WeatherCM/FGWeatherParse.h b/src/WeatherCM/FGWeatherParse.h
index cdfdfc8eb646d602e8b8e6b4b1141b75c0e00fcf..5b51681f641affb4b5ed0f1280c82b5c39c360e3 100644 (file)
--- a/src/WeatherCM/FGWeatherParse.h
+++ b/src/WeatherCM/FGWeatherParse.h
@@ -61,6 +61,10 @@ HISTORY
 /****************************************************************************/
 /* INCLUDES                                                                */
 /****************************************************************************/
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <simgear/compiler.h>
 #include <vector>