Fixes to get back support for Voodoo-1/2 cards and the voodoo-in-a-window

hack.

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index d86fd3e69b58caca1315d07802c00351bce3a8d9..c1b86e36eeeb4b55d18232ca312ee70338578b7c 100644 (file)
--- a/src/GUI/gui.cxx
+++ b/src/GUI/gui.cxx
@@ -69,6 +69,7 @@
 #include <Main/fg_io.hxx>
 #include <Main/globals.hxx>
 #include <Main/fg_props.hxx>
+#include <Main/options.hxx>
 
 #ifdef FG_NETWORK_OLK
 #include <NetworkOLK/network.h>

diff --git a/src/Main/keyboard.cxx b/src/Main/keyboard.cxx
index d403116a640d7070dca0c4197320f707ba299d4a..f17aaae4527e88ae4a74276d6f4bba8bbfc9d4a1 100644 (file)
--- a/src/Main/keyboard.cxx
+++ b/src/Main/keyboard.cxx
@@ -71,7 +71,7 @@
 #include "globals.hxx"
 #include "keyboard.hxx"
 #include "fg_props.hxx"
-
+#include "options.hxx"
                                // From main.cxx
 extern void fgReshape( int width, int height );
 

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 5c63442e4fa99a89d4d1522855c0e93765e0d07f..01c0dfbf159ca3116fa25053c83d7219b81a54ad 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -27,6 +27,11 @@
 
 #include <simgear/compiler.h>
 
+/* normans fix */
+#if defined(FX) && defined(XMESA)
+bool global_fullscreen = true;
+#endif
+
 #include <math.h>            // rint()
 #include <stdio.h>
 #include <stdlib.h>          // atof(), atoi()
@@ -993,7 +998,7 @@ fgParseOptions (const string& path) {
 void 
 fgUsage ()
 {
-    cout << "Usage: fg [ options ... ]" << endl;
+    cout << "Usage: fgfs [ options ... ]" << endl;
     cout << endl;
 
     cout << "General Options:" << endl;

diff --git a/src/Main/options.hxx b/src/Main/options.hxx
index 5ce598f8371541e7a65493069fe019093ca2b12f..36128137b0fd4dc028128e0265a4626f70c9f8a2 100644 (file)
--- a/src/Main/options.hxx
+++ b/src/Main/options.hxx
@@ -36,6 +36,11 @@ extern void fgParseOptions (int argc, char ** argv);
 extern void fgParseOptions (const string &file_path);
 extern void fgUsage ();
 
-#endif /* _OPTIONS_HXX */
+
+/* normans fix */
+#if defined(FX) && defined(XMESA)
+extern bool global_fullscreen;
+#endif
 
 
+#endif /* _OPTIONS_HXX */