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

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/core

Files:

• ArgumentCompletionFunctions.cc (modified) (1 diff)
• CorePrereqs.h (modified) (1 diff)
• Functor.h (modified) (2 diffs)

code/branches/buildsystem2/src/core/ArgumentCompletionFunctions.cc

@@ -63 +63 @@
                     startdirectory = ".";
                 }
-#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
+#ifdef ORXONOX_PLATFORM_WINDOWS
                 else
                 {

code/branches/buildsystem2/src/core/CorePrereqs.h

@@ -42 +42 @@
 // Shared library settings
 //-----------------------------------------------------------------------
-#if (ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32) && !defined( CORE_STATIC_BUILD )
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined( CORE_STATIC_BUILD )
 #  ifdef CORE_SHARED_BUILD
 #    define _CoreExport __declspec(dllexport)

code/branches/buildsystem2/src/core/Functor.h

@@ -436 +436 @@
 
 // disable annoying warning about forcing value to boolean
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#ifdef ORXONOX_COMPILER_MSVC
 #pragma warning(push)
 #pragma warning(disable:4100 4800)
@@ -475 +475 @@
 }
 
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#ifdef ORXONOX_COMPILER_MSVC
 #pragma warning(pop)
 #endif