[Orxonox-commit 6354] r11011 - in code/trunk/src: libraries/core orxonox

landauf at orxonox.net landauf at orxonox.net
Sat Jan 2 11:04:56 CET 2016


Author: landauf
Date: 2016-01-02 11:04:55 +0100 (Sat, 02 Jan 2016)
New Revision: 11011

Modified:
   code/trunk/src/libraries/core/Core.cc
   code/trunk/src/orxonox/Main.cc
Log:
moved command line argument from Main to Core because it is used there

Modified: code/trunk/src/libraries/core/Core.cc
===================================================================
--- code/trunk/src/libraries/core/Core.cc	2015-12-31 16:11:22 UTC (rev 11010)
+++ code/trunk/src/libraries/core/Core.cc	2016-01-02 10:04:55 UTC (rev 11011)
@@ -93,6 +93,9 @@
     SetCommandLineArgument(limitToCPU, 0).information("Limits the program to one CPU/core (1, 2, 3, etc.). Default is off = 0.");
 #endif
 
+    SetCommandLineArgument(generateDoc, "")
+        .information("Generates a Doxygen file from things like SetConsoleCommand");
+
     Core::Core(const std::string& cmdLine)
         : applicationPaths_(NULL)
         , configurablePaths_(NULL)

Modified: code/trunk/src/orxonox/Main.cc
===================================================================
--- code/trunk/src/orxonox/Main.cc	2015-12-31 16:11:22 UTC (rev 11010)
+++ code/trunk/src/orxonox/Main.cc	2016-01-02 10:04:55 UTC (rev 11011)
@@ -51,9 +51,6 @@
     /* ADD masterserver command */
     SetCommandLineSwitch(masterserver).information("Start in masterserver mode");
 
-    SetCommandLineArgument(generateDoc, "")
-        .information("Generates a Doxygen file from things like SetConsoleCommand");
-
     /**
     @brief
         Starting point of orxonox (however not the entry point of the program!)




More information about the Orxonox-commit mailing list