From d1a50b5667447ca98828856761fdaa694cd5f886 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Fri, 2 Feb 2001 22:39:13 +0000
Subject: [PATCH] Fixes to get back support for Voodoo-1/2 cards and the
 voodoo-in-a-window hack.

---
 src/GUI/gui.cxx       | 1 +
 src/Main/keyboard.cxx | 2 +-
 src/Main/options.cxx  | 7 ++++++-
 src/Main/options.hxx  | 7 ++++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/GUI/gui.cxx b/src/GUI/gui.cxx
index d86fd3e69..c1b86e36e 100644
--- 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 d403116a6..f17aaae45 100644
--- 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 5c63442e4..01c0dfbf1 100644
--- 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 5ce598f83..36128137b 100644
--- 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 */
-- 
2.39.5