Changeset 8091 for code/branches/mac_osx

Timestamp:

Mar 18, 2011, 10:13:27 AM (14 years ago)

Author:

youngk

Message:

Dang! Forgot something very serious. Now my changes won't be breaking anymore

Location:

code/branches/mac_osx/src

Files:

• Orxonox.cc (modified) (1 diff)
• libraries/core/GraphicsManager.cc (modified) (1 diff)

code/branches/mac_osx/src/Orxonox.cc

@@ -62 +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 = 2; i < argc; ++i)
+        for (int i = MAC_ARGC_HACK; i < argc; ++i)
             strCmdLine = strCmdLine + argv[i] + ' ';
 #endif

code/branches/mac_osx/src/libraries/core/GraphicsManager.cc

@@ -315 +315 @@
         Ogre::WindowEventUtilities::addWindowEventListener(this->renderWindow_, ogreWindowEventListener_.get());
 
-// HACK
-//#ifdef ORXONOX_PLATFORM_APPLE
-//        //INFO: This will give our window focus, and not lock it to the terminal
-//        ProcessSerialNumber psn = {0, kCurrentProcess};
-//        TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-//        SetFrontProcess(&psn);
-//#endif
-// End of HACK
-
         // create a full screen default viewport
         // Note: This may throw when adding a viewport with an existing z-order!