Changeset 7423 for sandbox_qt/src/Orxonox.cc

Timestamp:

Sep 12, 2010, 1:39:02 PM (15 years ago)

Author:

rgrieder

Message:

Sorted out application entry point.

File:

• sandbox_qt/src/Orxonox.cc (modified) (2 diffs)

sandbox_qt/src/Orxonox.cc

@@ -34 +34 @@
 */
 
-#include "SpecialConfig.h"
-
-#ifdef ORXONOX_USE_WINMAIN
-# ifndef WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-# endif
-#include <windows.h>
-#endif
+#include "OrxonoxConfig.h"
 
 #include "util/Debug.h"
@@ -51 +44 @@
     Main method. Game starts here (except for static initialisations).
 */
-#ifdef ORXONOX_USE_WINMAIN
-INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
-#else
 int main(int argc, char** argv)
-#endif
 {
     try
     {
-#ifndef ORXONOX_USE_WINMAIN
-        std::string strCmdLine;
-        for (int i = 1; i < argc; ++i)
-            strCmdLine = strCmdLine + argv[i] + ' ';
-#endif
-
-        return orxonox::main(strCmdLine);
+        return orxonox::main(argc, argv);
     }
     catch (...)