Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8356 for code/branches


Ignore:
Timestamp:
Apr 28, 2011, 4:29:37 PM (14 years ago)
Author:
rgrieder
Message:

Merged remaining revisions in mac_osx to mac_osx2 branch.

Location:
code/branches/mac_osx2
Files:
7 edited
14 copied

Legend:

Unmodified
Added
Removed

  • code/branches/mac_osx2

  • code/branches/mac_osx2/cmake/tools/TargetUtilities.cmake

    r8351 r8356  
    235235  # Don't compile header files
    236236  FOREACH(_file ${_${_target_name}_files})
    237     IF(NOT _file MATCHES "\\.(c|cc|cpp|cxx|mm)$")
     237    IF(NOT _file MATCHES "\\.(c|cc|cpp|cxx|m|mm)$")
    238238      SET_SOURCE_FILES_PROPERTIES(${_file} PROPERTIES HEADER_FILE_ONLY TRUE)
    239239    ENDIF()

  • code/branches/mac_osx2/data/mac/Orxonox-Info.plist

    r8351 r8356  
    77        <key>CFBundleExecutable</key>
    88        <string>${EXECUTABLE_NAME}</string>
     9        <key>CFBundleGetInfoString</key>
     10        <string>Orxonox: The hottest space shooter ever to exist!</string>
    911        <key>CFBundleIconFile</key>
    1012        <string>Icon.icns</string>
    … …  
    1517        <key>CFBundleName</key>
    1618        <string>${PROJECT_NAME}</string>
     19        <key>CFBundlePackageType</key>
     20        <string>APPL</string>
     21        <key>CFBundleShortVersionString</key>
     22        <string>${ORXONOX_VERSION}, ${ORXONOX_VERSION_NAME}</string>
    1723        <key>CFBundleVersion</key>
    1824        <string>${ORXONOX_VERSION}</string>
    19         <key>CFBundleShortVersionString</key>
    20         <string>${ORXONOX_VERSION}, ${ORXONOX_VERSION_NAME}</string>
    21         <key>CFBundleGetInfoString</key>
    22         <string>Orxonox: The hottest space shooter ever to exist!</string>
     25        <key>LSMinimumSystemVersion</key>
     26        <string>10.5</string>
    2327        <key>NSHumanReadableCopyright</key>
    2428        <string>GPL version 2 or higher, and CC-BY-SA</string>
    25         <key>CFBundlePackageType</key>
    26         <string>APPL</string>
    27         <key>LSMinimumSystemVersion</key>
    28         <string>10.5</string>
    2929        <key>NSMainNibFile</key>
    3030        <string>MainMenu</string>
    3131        <key>NSPrincipalClass</key>
    3232        <string>NSApplication</string>
     33        <key>CMSubmitURL</key>
     34        <string></string>
     35        <key>CMMaxReports</key>
     36        <integer>100</integer>
    3337</dict>
    3438</plist>

  • code/branches/mac_osx2/src/CMakeLists.txt

    r8351 r8356  
    196196# Apple Mac OS X specific build settings
    197197IF(APPLE)
    198   # On Apple we need to link to AppKit and Foundation frameworks
     198  # On Apple we need to link to AppKit, Foundation frameworks
    199199  TARGET_LINK_LIBRARIES(orxonox-main
     200    cmcrashreporter_orxonox
    200201    "-framework AppKit"
    201202    "-framework Foundation"
     203    "-framework CoreFoundation"
    202204  )
    203205

  • code/branches/mac_osx2/src/Orxonox.cc

    r8351 r8356  
    7575            strCmdLine = strCmdLine + argv[i] + ' ';
    7676#endif
    77 
     77       
     78        // Use these statements to make Orxonox go crashycrash
     79        //int* crashInt = NULL;
     80        //COUT(0) << *crashInt << std::endl;
     81             
    7882        return orxonox::main(strCmdLine);
    7983    }

  • code/branches/mac_osx2/src/OrxonoxMac.mm

    r8351 r8356  
    2828
    2929#import "OrxonoxMac.h"
     30#import <cmcrashreporter/CMCrashReporter.h>
    3031
    3132static int argc_s = 0;
    … …  
    4647- (void)applicationDidFinishLaunching:(NSNotification *)notification
    4748{
     49    // This call initializes the crash reporter, which sends crash reports to the developers
     50    [CMCrashReporter check];
     51   
    4852    exit(main_mac(argc_s, argv_s));
    4953}

  • code/branches/mac_osx2/src/external/CMakeLists.txt

    r8351 r8356  
    2323ADD_SUBDIRECTORY(bullet)
    2424ADD_SUBDIRECTORY(cpptcl)
     25ADD_SUBDIRECTORY(cmcrashreporter)
    2526ADD_SUBDIRECTORY(enet)
    2627ADD_SUBDIRECTORY(loki)
Note: See TracChangeset for help on using the changeset viewer.