Changeset 8084

Timestamp:

Mar 17, 2011, 12:37:48 PM (13 years ago)

Author:

youngk

Message:

Disabling the changes made, so that it becomes at least playable. @Reto: Once again, keep your finger off the merge button

Location:

code/branches/mac_osx/src

Files:

• CMakeLists.txt (modified) (1 diff)
• Orxonox.cc (modified) (1 diff)

code/branches/mac_osx/src/CMakeLists.txt

@@ -140 +140 @@
   SOURCE_FILES
     Orxonox.cc
-    OrxonoxMac.mm
+#    OrxonoxMac.mm
   OUTPUT_NAME orxonox
 )

code/branches/mac_osx/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)
+//#elif defined(ORXONOX_PLATFORM_APPLE)
+//int main_mac(int argc, char** argv)
 #else
 int main(int argc, char** argv)