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
#include
#include
+#include
#ifdef FG_NETWORK_OLK #include 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 +/* normans fix */ +#if defined(FX) && defined(XMESA) +bool global_fullscreen = true; +#endif + #include // rint() #include #include // 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 (); + +/* normans fix */ +#if defined(FX) && defined(XMESA) +extern bool global_fullscreen; +#endif + + #endif /* _OPTIONS_HXX */ - -