Changeset 3323

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

Files:

• cmake/BuildConfig.cmake (modified) (1 diff)
• src/core/CommandLine.cc (modified) (2 diffs)
• src/core/CommandLine.h (modified) (2 diffs)
• src/core/Core.cc (modified) (2 diffs)
• src/core/Core.h (modified) (1 diff)
• src/core/Game.cc (modified) (2 diffs)
• src/core/Game.h (modified) (1 diff)
• src/orxonox/GraphicsManager.cc (modified) (1 diff)
• src/orxonox/Main.cc (modified) (2 diffs)

code/trunk/cmake/BuildConfig.cmake

@@ -74 +74 @@
 
 # Use WinMain() or main()?
-OPTION(ORXONOX_USE_WINMAIN "Use WinMain (doesn't show console) or main" FALSE)
+IF(WIN32)
+  OPTION(ORXONOX_USE_WINMAIN "Use WinMain (doesn't show console) or main" FALSE)
+ENDIF()
 
 ################# OGRE Plugins ##################

code/trunk/src/core/CommandLine.cc

@@ -332 +332 @@
         Parses only the command line for CommandLineArguments.
     */
-    void CommandLine::_parseCommandLine(int argc, char** argv)
+    void CommandLine::_parseCommandLine(const std::string& cmdLine)
     {
         std::vector<std::string> args;
-        for (int i = 1; i < argc; ++i)
-            args.push_back(argv[i]);
+        SubString tokens(cmdLine, " ", " ", false, '\\', true, '"', true, '(', ')', false);
+        for (unsigned i = 0; i < tokens.size(); ++i)
+            args.push_back(tokens[i]);
         this->_parse(args, false);
     }
@@ -363 +364 @@
                 //if (!(line[0] == '#' || line[0] == '%'))
                 //{
-                SubString tokens(line, " ", " ", false, 92, false, 34, false, 40, 41, false, '#');
+                SubString tokens(line, " ", " ", false, '\\', true, '"', true, '(', ')', false, '#');
                 for (unsigned i = 0; i < tokens.size(); ++i)
                     if (tokens[i][0] != '#')

code/trunk/src/core/CommandLine.h

@@ -142 +142 @@
 
         //! Parse redirection to internal member method.
-        static void parseCommandLine(int argc, char** argv) { _getInstance()._parseCommandLine(argc, argv); }
+        static void parseCommandLine(const std::string& cmdLine) { _getInstance()._parseCommandLine(cmdLine); }
         static void parseFile() { _getInstance()._parseFile(); }
 
@@ -174 +174 @@
         static CommandLine& _getInstance();
 
-        void _parseCommandLine(int argc, char** argv);
+        void _parseCommandLine(const std::string& cmdLine);
         void _parseFile();
         void _parse(const std::vector<std::string>& arguments, bool bParsingFile);

code/trunk/src/core/Core.cc

@@ -229 +229 @@
 
 
-    Core::Core(int argc, char** argv)
+    Core::Core(const std::string& cmdLine)
     {
         if (singletonRef_s != 0)
@@ -242 +242 @@
 
         // Parse command line arguments first
-        CommandLine::parseCommandLine(argc, argv);
+        CommandLine::parseCommandLine(cmdLine);
 
         // Determine and set the location of the executable

code/trunk/src/core/Core.h

@@ -66 +66 @@
                 GeneralException
             */
-            Core(int argc, char** argv);
+            Core(const std::string& cmdLine);
             ~Core();
 

code/trunk/src/core/Game.cc

@@ -110 +110 @@
         Non-initialising constructor.
     */
-    Game::Game(int argc, char** argv)
+    Game::Game(const std::string& cmdLine)
     {
         if (singletonRef_s != 0)
@@ -137 +137 @@
 
         // Create the Core
-        this->core_ = new Core(argc, argv);
+        this->core_ = new Core(cmdLine);
 
         // After the core has been created, we can safely instantiate the GameStates

code/trunk/src/core/Game.h

@@ -68 +68 @@
     {
     public:
-        Game(int argc, char** argv);
+        Game(const std::string& cmdLine);
         ~Game();
 

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(