[Orxonox-commit 3397] r8084 - code/branches/mac_osx/src

[youngk at orxonox.net]

Author: youngk
Date: 2011-03-17 12:37:48 +0100 (Thu, 17 Mar 2011)
New Revision: 8084

Modified:
   code/branches/mac_osx/src/CMakeLists.txt
   code/branches/mac_osx/src/Orxonox.cc
Log:
Disabling the changes made, so that it becomes at least playable. @Reto: Once again, keep your finger off the merge button :)

Modified: code/branches/mac_osx/src/CMakeLists.txt
===================================================================
--- code/branches/mac_osx/src/CMakeLists.txt	2011-03-17 11:12:17 UTC (rev 8083)
+++ code/branches/mac_osx/src/CMakeLists.txt	2011-03-17 11:37:48 UTC (rev 8084)
@@ -139,7 +139,7 @@
     orxonox
   SOURCE_FILES
     Orxonox.cc
-    OrxonoxMac.mm
+#    OrxonoxMac.mm
   OUTPUT_NAME orxonox
 )
 

Modified: code/branches/mac_osx/src/Orxonox.cc
===================================================================
--- code/branches/mac_osx/src/Orxonox.cc	2011-03-17 11:12:17 UTC (rev 8083)
+++ code/branches/mac_osx/src/Orxonox.cc	2011-03-17 11:37:48 UTC (rev 8084)
@@ -52,8 +52,8 @@
 */
 #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)
+//#elif defined(ORXONOX_PLATFORM_APPLE)
+//int main_mac(int argc, char** argv)
 #else
 int main(int argc, char** argv)
 #endif