Changeset 7450

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:

• CMakeLists.txt (modified) (2 diffs)
• SpecialConfig.h.in (modified) (2 diffs)
• libraries/util/SignalHandler.cc (modified) (1 diff)

code/trunk/src/CMakeLists.txt

@@ -84 +84 @@
   ${ZLIB_INCLUDE_DIR}
   ${VLD_INCLUDE_DIR}
+  ${DBGHELP_INCLUDE_DIR}
 
   # All includes in "externals" should be prefixed with the path
@@ -98 +99 @@
 IF(CEGUILUA_USE_INTERNAL_LIBRARY)
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/ceguilua/ceguilua-${CEGUI_VERSION})
-ENDIF()
-
-IF (DBGHELP_FOUND)
-  INCLUDE_DIRECTORIES(${DBGHELP_INCLUDE_DIR})
 ENDIF()
 

code/trunk/src/SpecialConfig.h.in

@@ -51 +51 @@
 
 #cmakedefine DBGHELP_FOUND                  ///< If DbgHelp was found on windows
+
+#cmakedefine ORXONOX_USE_WINMAIN            ///< Using MSVC or XCode IDE
 
 // Handle default ConfigValues
@@ -109 +111 @@
 } }
 
-#cmakedefine ORXONOX_USE_WINMAIN  ///< Using MSVC or XCode IDE
-
 #endif /* _SpecialConfig_H__ */

code/trunk/src/libraries/util/SignalHandler.cc

@@ -383 +383 @@
             if (SignalHandler::singletonPtr_s == 0)
             {
-                COUT(1) << "Catched an unhandled exception" << std::endl << "Can't write backtrace because SignalHandler is already destroyed" << std::endl;
+                COUT(1) << "Caught an unhandled exception" << std::endl << "Can't write backtrace because SignalHandler is already destroyed" << std::endl;
                 exit(EXIT_FAILURE);
             }
 
-            COUT(1) << "Catched an unhandled exception" << std::endl << "Try to write backtrace to orxonox_crash.log..." << std::endl;
+            COUT(1) << "Caught an unhandled exception" << std::endl << "Try to write backtrace to orxonox_crash.log..." << std::endl;
 
             // write the crash log