Changeset 454 for code/branches/objecthierarchy/src/orxonox/orxonox.cc

Timestamp:

Dec 10, 2007, 5:56:22 PM (16 years ago)

Author:

landauf

Message:

no idea if this works: added chrigis SignalHandler from orxonox_v1 to catch SIGSEGV, SIGABRT and SIGILL signals and write debug informations into orxonox.log

File:

• code/branches/objecthierarchy/src/orxonox/orxonox.cc (modified) (3 diffs)

code/branches/objecthierarchy/src/orxonox/orxonox.cc

@@ -43 +43 @@
 
 #include "core/CoreIncludes.h"
+#include "core/SignalHandler.h"
 #include "objects/Tickable.h"
 #include "objects/Timer.h"
@@ -781 +782 @@
 using namespace Ogre;
 
-#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-#define WIN32_LEAN_AND_MEAN
-#include "windows.h"
-
-             INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
-#else
+//#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+//#define WIN32_LEAN_AND_MEAN
+//#include "windows.h"
+
+//             INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
+//#else
              int main(int argc, char **argv)
-#endif
+//#endif
 {
   try
   {
+    SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
     orxonox::OrxApplication orxonox;
     orxonox.go();
@@ -797 +799 @@
   catch(Exception& e)
   {
-#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-    MessageBoxA(NULL, e.getFullDescription().c_str(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
-#else
+//#if OGRE_PLATFORM == PLATFORM_WIN32 || OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+//    MessageBoxA(NULL, e.getFullDescription().c_str(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+//#else
     fprintf(stderr, "An exception has occurred: %s\n",
             e.getFullDescription().c_str());
-#endif
+//#endif
   }