X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fbootstrap.cxx;h=877712d359f920f2ef0dd2c3338796ba6af2cc7e;hb=f6b94765b0a7f356290132e185db1d4f2378a65f;hp=aa9c314a2e3f44c71c812f2477ae6712f0ad5098;hpb=8e1248e1e14bbce203e8d60c67c9887b0683e3d5;p=flightgear.git

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index aa9c314a2..877712d35 100644
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -42,6 +42,7 @@
 #include <simgear/compiler.h>
 #include <simgear/structure/exception.hxx>
 #include <simgear/debug/logstream.hxx>
+#include <simgear/math/SGMath.hxx>
 
 #include <cstring>
 #include <iostream>
@@ -50,6 +51,8 @@ using std::endl;
 
 #include "main.hxx"
 #include "globals.hxx"
+#include "fg_props.hxx"
+#include "fgviewer.hxx"
 
 
 #include "fg_os.hxx"
@@ -180,7 +183,7 @@ int main ( int argc, char **argv ) {
     }
     initFPE();
 #endif
-#if !defined( _MSC_VER ) && !defined( __MINGW32__ )
+#ifndef _WIN32
     signal(SIGPIPE, SIG_IGN);
 #endif
 
@@ -207,19 +210,29 @@ int main ( int argc, char **argv ) {
 #if defined( HAVE_BC5PLUS )
     _control87(MCW_EM, MCW_EM);  /* defined in float.h */
 #endif
+    bool fgviewer = false;
+    for (int i = 0; i < argc; ++i) {
+        if (!strcmp("--fgviewer", argv[i])) {
+            fgviewer = true;
+            break;
+        }
+    }
 
     // FIXME: add other, more specific
     // exceptions.
     try {
         std::set_terminate(fg_terminate);
         atexit(fgExitCleanup);
-        fgMainInit(argc, argv);
+        if (fgviewer)
+            fgviewerMain(argc, argv);
+        else
+            fgMainInit(argc, argv);
     } catch (const sg_throwable &t) {
                             // We must use cerr rather than
                             // logging, since logging may be
                             // disabled.
         cerr << "Fatal error: " << t.getFormattedMessage() << endl;
-        if (!t.getOrigin().empty())
+        if (std::strlen(t.getOrigin()) != 0)
             cerr << " (received from " << t.getOrigin() << ')' << endl;
 
     } catch (const string &s) {