Changeset 8129 for code/branches/kicklib/src/Orxonox.cc
- Timestamp:
- Mar 26, 2011, 9:41:28 PM (13 years ago)
- Location:
- code/branches/kicklib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/kicklib
- Property svn:mergeinfo changed
/code/branches/mac_osx merged: 8083-8084,8090-8092,8114,8116,8125,8127-8128
- Property svn:mergeinfo changed
-
code/branches/kicklib/src/Orxonox.cc
r6417 r8129 53 53 #ifdef ORXONOX_USE_WINMAIN 54 54 INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT) 55 #elif defined(ORXONOX_PLATFORM_APPLE) 56 int main_mac(int argc, char** argv) 55 57 #else 56 58 int main(int argc, char** argv) … … 60 62 { 61 63 #ifndef ORXONOX_USE_WINMAIN 64 65 // On Apples, the kernel supplies a second argument, which we have to circumvent 66 #ifdef ORXONOX_PLATFORM_APPLE 67 # define MAC_ARGC_HACK 2 68 #else 69 # define MAC_ARGC_HACK 1 70 #endif 71 62 72 std::string strCmdLine; 63 for (int i = 1; i < argc; ++i)73 for (int i = MAC_ARGC_HACK; i < argc; ++i) 64 74 strCmdLine = strCmdLine + argv[i] + ' '; 65 75 #endif
Note: See TracChangeset
for help on using the changeset viewer.