Changeset 3323 for code/trunk/src/orxonox

Timestamp:

Jul 19, 2009, 3:11:15 PM (15 years ago)

Author:

rgrieder

Message:

ORXONOX_USE_WINMAIN should now work as expected.

Location:

code/trunk/src/orxonox

Files:

• GraphicsManager.cc (modified) (1 diff)
• Main.cc (modified) (2 diffs)

code/trunk/src/orxonox/GraphicsManager.cc

@@ -278 +278 @@
         boost::filesystem::path folder(ogrePluginsFolder_);
         // Do some SubString magic to get the comma separated list of plugins
-        SubString plugins(ogrePlugins_, ",", " ", false, 92, false, 34, false, 40, 41, false, '\0');
+        SubString plugins(ogrePlugins_, ",", " ", false, '\\', false, '"', false, '(', ')', false, '\0');
         // Use backslash paths on Windows! file_string() already does that though.
         for (unsigned int i = 0; i < plugins.size(); ++i)

code/trunk/src/orxonox/Main.cc

@@ -35 +35 @@
 
 #include "OrxonoxPrereqs.h"
+#include "SpecialConfig.h"
+
+#ifdef ORXONOX_USE_WINMAIN
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+# endif
+#include <windows.h>
+#endif
 
 #include "util/Debug.h"
@@ -55 +63 @@
     try
     {
-        game = new Game(argc, argv);
+#ifndef ORXONOX_USE_WINMAIN
+        std::string strCmdLine;
+        for (int i = 1; i < argc; ++i)
+            strCmdLine += argv[i] + std::string(" ");
+#endif
+        game = new Game(strCmdLine);
 
         game->setStateHierarchy(