Changeset 7423

Timestamp:

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

Author:

rgrieder

Message:

Sorted out application entry point.

Location:

sandbox_qt/src

Files:

• CMakeLists.txt (modified) (1 diff)
• Orxonox.cc (modified) (2 diffs)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/Main.cc (modified) (2 diffs)
• orxonox/Main.h (modified) (1 diff)

sandbox_qt/src/CMakeLists.txt

@@ -94 +94 @@
   ${ORXONOX_WIN32}
   LINK_LIBRARIES
+    ${QT_QTMAIN_LIBRARY}
     orxonox
   SOURCE_FILES

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 (...)

sandbox_qt/src/orxonox/CMakeLists.txt

@@ -33 +33 @@
   LINK_LIBRARIES
     ${QT_QTCORE_LIBRARY}
+    ${QT_QTGUI_LIBRARY}
     util
     core

sandbox_qt/src/orxonox/Main.cc

@@ -36 +36 @@
 #include "OrxonoxPrereqs.h"
 
+#include <QApplication>
+#include <QCoreApplication>
+
 #include "core/Game.h"
 #include "Main.h"
@@ -45 +48 @@
         Starting point of orxonox (however not the entry point of the program!)
     */
-    int main(const std::string& strCmdLine)
+    int main(int argc, char** argv)
     {
-        Game* game = new Game(strCmdLine);
+        QApplication app(argc, argv);
+
+        QCoreApplication::setOrganizationName("");
+        QCoreApplication::setOrganizationDomain("");
+        QCoreApplication::setApplicationName("");
 
         //if (CommandLineParser::getValue("generateDoc").getString().empty())
-        //    game->run();
 
-        delete game;
-
-        return 0;
+        return app.exec();
+        //return 0;
     }
 }

sandbox_qt/src/orxonox/Main.h

@@ -35 +35 @@
 namespace orxonox
 {
-    _OrxonoxExport int main(const std::string& strCmdLine);
+    _OrxonoxExport int main(int argc, char** argv);
 }