X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2Fbootstrap.cxx;h=f240eb3d6a02c9a42488c4eec33059a2e77d9ef3;hb=f79dbc23bf98ddde4e7f18e578728f5a1d51e15b;hp=1b74e40c7b2d8da1a4f060df758b554effa168da;hpb=d33b6da077d1e4d2db3ae56236680ec3e86ae9d0;p=flightgear.git

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index 1b74e40c7..f240eb3d6 100644
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -27,10 +27,10 @@
 
 #if defined(__linux__) && defined(__i386__)
 #  include <fpu_control.h>
-#  include <signal.h>
 #endif
 
 #include <errno.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -49,6 +49,7 @@ SG_USING_STD(endl);
 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #  include <float.h>
+#  include <pthread.h>
 #endif
 
 #include "fg_os.hxx"
@@ -115,6 +116,7 @@ int main ( int argc, char **argv );
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
                              LPSTR lpCmdLine, int nCmdShow) {
 
+  logbuf::has_no_console();
   main( __argc, __argv );
 }
 #endif
@@ -140,17 +142,35 @@ void flush_fpe(void)
 }
 #endif
 
+static void fg_terminate() {
+    cerr << endl <<
+            "Uncaught Exception: you should see a meaningful error message\n"
+            "here, but your GLUT (or SDL) library was apparently compiled\n"
+            "and/or linked without exception support. Please complain to\n"
+            "its provider!"
+            << endl << endl;
+    abort();
+}
+
 int _bootstrap_OSInit;
 
 // Main entry point; catch any exceptions that have made it this far.
 int main ( int argc, char **argv ) {
 
+#ifdef PTW32_STATIC_LIB
+    // Initialise static pthread win32 lib
+    pthread_win32_process_attach_np ();
+#endif
     _bootstrap_OSInit = 0;
 
-    // Enable floating-point exceptions for Linux/x86
 #if defined(__linux__) && defined(__i386__)
+    // Enable floating-point exceptions for Linux/x86
     initFPE();
+#elif defined(__FreeBSD__)
+    // Ignore floating-point exceptions on FreeBSD
+    signal(SIGFPE, SIG_IGN);
 #endif
+    signal(SIGPIPE, SIG_IGN);
 
 #if defined(sgi)
     flush_fpe();
@@ -194,9 +214,10 @@ int main ( int argc, char **argv ) {
     // FIXME: add other, more specific
     // exceptions.
     try {
+        std::set_terminate(fg_terminate);
         atexit(fgExitCleanup);
         fgMainInit(argc, argv);
-    } catch (sg_throwable &t) {
+    } catch (const sg_throwable &t) {
                             // We must use cerr rather than
                             // logging, since logging may be
                             // disabled.
@@ -204,7 +225,10 @@ int main ( int argc, char **argv ) {
         if (!t.getOrigin().empty())
             cerr << " (received from " << t.getOrigin() << ')' << endl;
 
-    } catch (string &s) {
+    } catch (const string &s) {
+        cerr << "Fatal error: " << s << endl;
+
+    } catch (const char *s) {
         cerr << "Fatal error: " << s << endl;
 
     } catch (...) {