Changeset 2639 for code/branches/buildsystem2/src/util

Timestamp:

Feb 8, 2009, 12:10:57 AM (16 years ago)

Author:

rgrieder

Message:

Cleanup in OrxonoxConfig.h.in. Made use of various CMake features like CheckInclude or CheckCompiles to determine some options and macros in the config header file.

Also removed util/Integers.h and placed the code directory in OrxonoxConfig.h.in.

Location:

code/branches/buildsystem2/src/util

Files:

• CMakeLists.txt (modified) (2 diffs)
• CRC32.h (modified) (1 diff)
• Clipboard.cc (modified) (3 diffs)
• Convert.h (modified) (3 diffs)
• Integers.h (deleted)
• Math.h (modified) (1 diff)
• SignalHandler.cc (modified) (2 diffs)
• SignalHandler.h (modified) (3 diffs)
• Sleep.h (modified) (1 diff)
• UtilPrereqs.h (modified) (1 diff)

code/branches/buildsystem2/src/util/CMakeLists.txt

@@ -25 +25 @@
   Exception.h
   ExprParser.h
-  Integers.h
   Math.h
   MathConvert.h
@@ -54 +53 @@
 #SET(UTIL_FILES ${UTIL_SRC_FILES} ${UTIL_HDR_FILES})
 GENERATE_SOURCE_GROUPS(${UTIL_FILES})
-# Also add OrxonoxConfig.h to have it least somewhere in the IDE
-LIST(APPEND UTIL_FILES ${CMAKE_BINARY_DIR}/src/OrxonoxConfig.h)
-SOURCE_GROUP("" FILES ${CMAKE_BINARY_DIR}/src/OrxonoxConfig.h)
+# Also add OrxonoxConfig to have it least somewhere in the IDE
+LIST(APPEND UTIL_FILES
+  ${CMAKE_BINARY_DIR}/src/OrxonoxConfig.h
+  ${CMAKE_SOURCE_DIR}/src/OrxonoxConfig.h.in
+)
+SOURCE_GROUP("" FILES
+  ${CMAKE_BINARY_DIR}/src/OrxonoxConfig.h
+  ${CMAKE_SOURCE_DIR}/src/OrxonoxConfig.h.in
+)
 
 IF(NOT GCC_SYSTEM_HEADER_SUPPORT)

code/branches/buildsystem2/src/util/CRC32.h

@@ -32 +32 @@
 #include "UtilPrereqs.h"
 #include <iostream>
-#include "Integers.h"
 
 namespace orxonox

code/branches/buildsystem2/src/util/Clipboard.cc

@@ -36 +36 @@
 #include "Clipboard.h"
 
-#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
+#ifdef ORXONOX_PLATFORM_WINDOWS
 
 /////////////
@@ -104 +104 @@
 }
 
-#else /* ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32 */
+#else /* ORXONOX_PLATFORM_WINDOWS */
 
 /////////////
@@ -135 +135 @@
 }
 
-#endif /* ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32 */
+#endif /* ORXONOX_PLATFORM_WINDOWS */

code/branches/buildsystem2/src/util/Convert.h

@@ -50 +50 @@
 // This is however exactly what convertValue does, so we need to suppress these warnings.
 // They only occur when using the ImplicitConversion template.
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_GNUC
+#ifdef ORXONOX_COMPILER_GCC
 #  pragma GCC system_header
 #endif
@@ -63 +63 @@
 
 // disable warnings about possible loss of data
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#ifdef ORXONOX_COMPILER_MSVC
 #  pragma warning(push)
 #  pragma warning(disable:4244)
@@ -88 +88 @@
 }
 
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#ifdef ORXONOX_COMPILER_MSVC
 #  pragma warning(pop)
 #endif

code/branches/buildsystem2/src/util/Math.h

@@ -52 +52 @@
 
 //Get around Windows hackery
-#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
+#ifdef ORXONOX_PLATFORM_WINDOWS
 #  ifdef max
 #    undef max

code/branches/buildsystem2/src/util/SignalHandler.cc

@@ -45 +45 @@
 }
 
-#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_LINUX
+#ifdef ORXONOX_PLATFORM_LINUX
 
 #include <wait.h>
@@ -358 +358 @@
 }
 
-#endif /* ORXONOX_PLATFORM == ORXONOX_PLATFORM_LINUX */
+#endif /* ORXONOX_PLATFORM_LINUX */

code/branches/buildsystem2/src/util/SignalHandler.h

@@ -45 +45 @@
 }
 
-#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_LINUX
+#ifdef ORXONOX_PLATFORM_LINUX
 #include <signal.h>
 
@@ -97 +97 @@
 }
 
-#else /* ORXONOX_PLATFORM == ORXONOX_PLATFORM_LINUX */
+#else /* ORXONOX_PLATFORM_LINUX */
 
 namespace orxonox
@@ -114 +114 @@
 }
 
-#endif /* ORXONOX_PLATFORM == ORXONOX_PLATFORM_LINUX */
+#endif /* ORXONOX_PLATFORM_LINUX */
 
 #endif /* _SignalHandler_H__ */

code/branches/buildsystem2/src/util/Sleep.h

@@ -38 +38 @@
 #include "UtilPrereqs.h"
 
-#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
+#ifdef ORXONOX_PLATFORM_WINDOWS
 #include <winbase.h>
 

code/branches/buildsystem2/src/util/UtilPrereqs.h

@@ -40 +40 @@
 // Shared library settings
 //-----------------------------------------------------------------------
-#if (ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32) && !defined( UTIL_STATIC_BUILD )
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined( UTIL_STATIC_BUILD )
 #  ifdef UTIL_SHARED_BUILD
 #    define _UtilExport __declspec(dllexport)