Changeset 8129 for code/branches/kicklib/src/Orxonox.cc

Timestamp:

Mar 26, 2011, 9:41:28 PM (13 years ago)

Author:

rgrieder

Message:

Merged new revisions (8083 - 8125) from mac_osx to kicklib branch.

Location:

code/branches/kicklib

Files:

• . (modified) (1 prop)
• src/Orxonox.cc (modified) (2 diffs)

code/branches/kicklib/src/Orxonox.cc

@@ -53 +53 @@
 #ifdef ORXONOX_USE_WINMAIN
 INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
+#elif defined(ORXONOX_PLATFORM_APPLE)
+int main_mac(int argc, char** argv)
 #else
 int main(int argc, char** argv)
@@ -60 +62 @@
     {
 #ifndef ORXONOX_USE_WINMAIN
+
+// On Apples, the kernel supplies a second argument, which we have to circumvent
+#ifdef ORXONOX_PLATFORM_APPLE
+# define MAC_ARGC_HACK 2
+#else
+# define MAC_ARGC_HACK 1
+#endif
+    
         std::string strCmdLine;
-        for (int i = 1; i < argc; ++i)
+        for (int i = MAC_ARGC_HACK; i < argc; ++i)
             strCmdLine = strCmdLine + argv[i] + ' ';
 #endif