Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 17, 2011, 12:37:48 PM (14 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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/mac_osx/src/CMakeLists.txt

    r8083 r8084  
    140140  SOURCE_FILES
    141141    Orxonox.cc
    142     OrxonoxMac.mm
     142#    OrxonoxMac.mm
    143143  OUTPUT_NAME orxonox
    144144)
  • code/branches/mac_osx/src/Orxonox.cc

    r8083 r8084  
    5353#ifdef ORXONOX_USE_WINMAIN
    5454INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
    55 #elif defined(ORXONOX_PLATFORM_APPLE)
    56 int main_mac(int argc, char** argv)
     55//#elif defined(ORXONOX_PLATFORM_APPLE)
     56//int main_mac(int argc, char** argv)
    5757#else
    5858int main(int argc, char** argv)
Note: See TracChangeset for help on using the changeset viewer.