Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7450 for code


Ignore:
Timestamp:
Sep 13, 2010, 11:30:06 PM (14 years ago)
Author:
rgrieder
Message:
  • Catched → Caught
  • No idea why OROXNOX_USE_WINMAIN was at the bottom of SpecialConfig.h.in
  • Empty variables do nothing in CMake
Location:
code/trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/CMakeLists.txt

    r7449 r7450  
    8484  ${ZLIB_INCLUDE_DIR}
    8585  ${VLD_INCLUDE_DIR}
     86  ${DBGHELP_INCLUDE_DIR}
    8687
    8788  # All includes in "externals" should be prefixed with the path
     
    9899IF(CEGUILUA_USE_INTERNAL_LIBRARY)
    99100  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/ceguilua/ceguilua-${CEGUI_VERSION})
    100 ENDIF()
    101 
    102 IF (DBGHELP_FOUND)
    103   INCLUDE_DIRECTORIES(${DBGHELP_INCLUDE_DIR})
    104101ENDIF()
    105102
  • code/trunk/src/SpecialConfig.h.in

    r7449 r7450  
    5151
    5252#cmakedefine DBGHELP_FOUND                  ///< If DbgHelp was found on windows
     53
     54#cmakedefine ORXONOX_USE_WINMAIN            ///< Using MSVC or XCode IDE
    5355
    5456// Handle default ConfigValues
     
    109111} }
    110112
    111 #cmakedefine ORXONOX_USE_WINMAIN  ///< Using MSVC or XCode IDE
    112 
    113113#endif /* _SpecialConfig_H__ */
  • code/trunk/src/libraries/util/SignalHandler.cc

    r7449 r7450  
    383383            if (SignalHandler::singletonPtr_s == 0)
    384384            {
    385                 COUT(1) << "Catched an unhandled exception" << std::endl << "Can't write backtrace because SignalHandler is already destroyed" << std::endl;
     385                COUT(1) << "Caught an unhandled exception" << std::endl << "Can't write backtrace because SignalHandler is already destroyed" << std::endl;
    386386                exit(EXIT_FAILURE);
    387387            }
    388388
    389             COUT(1) << "Catched an unhandled exception" << std::endl << "Try to write backtrace to orxonox_crash.log..." << std::endl;
     389            COUT(1) << "Caught an unhandled exception" << std::endl << "Try to write backtrace to orxonox_crash.log..." << std::endl;
    390390
    391391            // write the crash log
Note: See TracChangeset for help on using the changeset viewer.