Fixes to get back support for Voodoo-1/2 cards and the voodoo-in-a-window
hack.
This commit is contained in:
parent
a5d1970007
commit
d1a50b5667
4 changed files with 15 additions and 4 deletions
|
@ -69,6 +69,7 @@
|
||||||
#include <Main/fg_io.hxx>
|
#include <Main/fg_io.hxx>
|
||||||
#include <Main/globals.hxx>
|
#include <Main/globals.hxx>
|
||||||
#include <Main/fg_props.hxx>
|
#include <Main/fg_props.hxx>
|
||||||
|
#include <Main/options.hxx>
|
||||||
|
|
||||||
#ifdef FG_NETWORK_OLK
|
#ifdef FG_NETWORK_OLK
|
||||||
#include <NetworkOLK/network.h>
|
#include <NetworkOLK/network.h>
|
||||||
|
|
|
@ -71,7 +71,7 @@
|
||||||
#include "globals.hxx"
|
#include "globals.hxx"
|
||||||
#include "keyboard.hxx"
|
#include "keyboard.hxx"
|
||||||
#include "fg_props.hxx"
|
#include "fg_props.hxx"
|
||||||
|
#include "options.hxx"
|
||||||
// From main.cxx
|
// From main.cxx
|
||||||
extern void fgReshape( int width, int height );
|
extern void fgReshape( int width, int height );
|
||||||
|
|
||||||
|
|
|
@ -27,6 +27,11 @@
|
||||||
|
|
||||||
#include <simgear/compiler.h>
|
#include <simgear/compiler.h>
|
||||||
|
|
||||||
|
/* normans fix */
|
||||||
|
#if defined(FX) && defined(XMESA)
|
||||||
|
bool global_fullscreen = true;
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <math.h> // rint()
|
#include <math.h> // rint()
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h> // atof(), atoi()
|
#include <stdlib.h> // atof(), atoi()
|
||||||
|
@ -993,7 +998,7 @@ fgParseOptions (const string& path) {
|
||||||
void
|
void
|
||||||
fgUsage ()
|
fgUsage ()
|
||||||
{
|
{
|
||||||
cout << "Usage: fg [ options ... ]" << endl;
|
cout << "Usage: fgfs [ options ... ]" << endl;
|
||||||
cout << endl;
|
cout << endl;
|
||||||
|
|
||||||
cout << "General Options:" << endl;
|
cout << "General Options:" << endl;
|
||||||
|
|
|
@ -36,6 +36,11 @@ extern void fgParseOptions (int argc, char ** argv);
|
||||||
extern void fgParseOptions (const string &file_path);
|
extern void fgParseOptions (const string &file_path);
|
||||||
extern void fgUsage ();
|
extern void fgUsage ();
|
||||||
|
|
||||||
|
|
||||||
|
/* normans fix */
|
||||||
|
#if defined(FX) && defined(XMESA)
|
||||||
|
extern bool global_fullscreen;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#endif /* _OPTIONS_HXX */
|
#endif /* _OPTIONS_HXX */
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue