Attempt #1 to sort out confusion between left / right / parking brake

[flightgear.git] / src / Main / bootstrap.cxx

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index cfa2178f4759fa2728e1bec3b22b2997d58c8522..6d711801b9fc31fcdb677bc5d5495ddf02ac38d9 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -33,7 +33,8 @@
 #include <stdlib.h>
 
 #include <simgear/compiler.h>
-#include <simgear/misc/exception.hxx>
+#include <simgear/structure/exception.hxx>
+#include <simgear/debug/logstream.hxx>
 
 #include STL_IOSTREAM
 SG_USING_STD(cerr);
@@ -47,7 +48,7 @@ SG_USING_STD(endl);
 #  include <float.h>
 #endif
 
-#include GLUT_H
+#include FG_GLUT_H
 
 #ifdef macintosh
 #  include <console.h>         // -dw- for command line dialog
@@ -119,7 +120,7 @@ int main ( int argc, char **argv ) {
 #endif
 
     // Keyboard focus hack
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(OSX_BUNDLE)
     {
       PSN psn;