Changeset 8356 for code/branches/mac_osx2/src
- Timestamp:
- Apr 28, 2011, 4:29:37 PM (14 years ago)
- Location:
- code/branches/mac_osx2
- Files:
-
- 5 edited
- 14 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/mac_osx2
- Property svn:mergeinfo changed
/code/branches/mac_osx merged: 8259-8260,8262
- Property svn:mergeinfo changed
-
code/branches/mac_osx2/src/CMakeLists.txt
r8351 r8356 196 196 # Apple Mac OS X specific build settings 197 197 IF(APPLE) 198 # On Apple we need to link to AppKit andFoundation frameworks198 # On Apple we need to link to AppKit, Foundation frameworks 199 199 TARGET_LINK_LIBRARIES(orxonox-main 200 cmcrashreporter_orxonox 200 201 "-framework AppKit" 201 202 "-framework Foundation" 203 "-framework CoreFoundation" 202 204 ) 203 205 -
code/branches/mac_osx2/src/Orxonox.cc
r8351 r8356 75 75 strCmdLine = strCmdLine + argv[i] + ' '; 76 76 #endif 77 77 78 // Use these statements to make Orxonox go crashycrash 79 //int* crashInt = NULL; 80 //COUT(0) << *crashInt << std::endl; 81 78 82 return orxonox::main(strCmdLine); 79 83 } -
code/branches/mac_osx2/src/OrxonoxMac.mm
r8351 r8356 28 28 29 29 #import "OrxonoxMac.h" 30 #import <cmcrashreporter/CMCrashReporter.h> 30 31 31 32 static int argc_s = 0; … … 46 47 - (void)applicationDidFinishLaunching:(NSNotification *)notification 47 48 { 49 // This call initializes the crash reporter, which sends crash reports to the developers 50 [CMCrashReporter check]; 51 48 52 exit(main_mac(argc_s, argv_s)); 49 53 } -
code/branches/mac_osx2/src/external/CMakeLists.txt
r8351 r8356 23 23 ADD_SUBDIRECTORY(bullet) 24 24 ADD_SUBDIRECTORY(cpptcl) 25 ADD_SUBDIRECTORY(cmcrashreporter) 25 26 ADD_SUBDIRECTORY(enet) 26 27 ADD_SUBDIRECTORY(loki)
Note: See TracChangeset
for help on using the changeset viewer.