Changeset 544

Timestamp:

Dec 16, 2007, 6:00:13 PM (16 years ago)

Author:

rgrieder

Message:

• added WinMain (no argument parser yet)
• made a few more adjustments, so that it compiles now under VC8 (actually it doesn't, I need to comment the with getMouseState or else I get a very strange linker error) (but I haven't committed this of course, since it compiles on tardis boxes)

Location:

code/branches/FICN/src/orxonox

Files:

• main.cc (modified) (2 diffs)
• particle/ParticleInterface.cc (modified) (1 diff)

code/branches/FICN/src/orxonox/main.cc

@@ -67 +67 @@
 #endif
 
-int main(int argc, char **argv)
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 
+#define WIN32_LEAN_AND_MEAN 
+#include "windows.h" 
+  INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
+  {
+    char *argv[2];
+    argv[0] = "asdfprogramName";
+    argv[1] =  strCmdLine;
+    int argc = 2;
+#else 
+  int main(int argc, char **argv) 
+  {
+#endif 
+    try {
+      SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
+      Orxonox* orx = Orxonox::getSingleton();
+#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE
+      orx->init(argc, argv, macBundlePath());
+      orx->start();
+#else
+      orx->init(argc, argv, "");
+      orx->start();
+#endif
+    }
+    catch (Ogre::Exception& e) {
+#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 
+      MessageBoxA(NULL, e.getFullDescription().c_str(),
+            "An exception has occured!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+#else
+      std::cerr << "Exception:\n";
+      std::cerr << e.getFullDescription().c_str() << "\n";
+#endif
+      return 1;
+    }
+    return 0;
+  }
+
+#ifdef __cplusplus
+}
+#endif
+
+
+/*int main(int argc, char **argv)
 {
   try
@@ -92 +138 @@
 }
 
+*/

code/branches/FICN/src/orxonox/particle/ParticleInterface.cc

@@ -28 +28 @@
 #include "ParticleInterface.h"
 #include <Ogre.h>
-#include <OIS/OIS.h>
+//#include <OIS/OIS.h>
 // #include <CEGUI/CEGUI.h>
 // #include <CEGUIRenderer.h>