Merge branch 'topic/gcintersect' into next

[flightgear.git] / src / Input / fgjs.cxx

diff --git a/src/Input/fgjs.cxx b/src/Input/fgjs.cxx
index 6f0176b4bce223e3de652c84daca475bc57423de..81c4cdda0c6fd1e25ad11002325662ddebda2c3e 100644 (file)
--- a/src/Input/fgjs.cxx
+++ b/src/Input/fgjs.cxx
@@ -28,8 +28,8 @@
 
 #include <simgear/compiler.h>
 
-#ifdef _MSC_VER
-#include <Winsock2.h>
+#if defined( _MSC_VER ) || defined( __MINGW32__ )
+#  include <Winsock2.h>
 #endif
 
 #include <math.h>
@@ -50,6 +50,7 @@ using std::string;
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/structure/exception.hxx>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/fg_io.hxx>
 #include <Main/fg_props.hxx>
@@ -80,6 +81,8 @@ int main( int argc, char *argv[] ) {
             cout << "Usage:" << endl;
             cout << "  --help\t\t\tShow this help" << endl;
             exit(0);
+       } else if (strncmp("--fg-root=", argv[i], 10) == 0) {
+           // used later
         } else {
             cout << "Unknown option \"" << argv[i] << "\"" << endl;
             exit(0);