Changeset 2650

Timestamp:

Feb 12, 2009, 4:24:59 PM (15 years ago)

Author:

rgrieder

Message:

• Libraries get built to lib/ instead of bin/. CMake 2.6.0 finally treats DLLs as runtime target, so we can do this.
• Bugfix in media directory finding
• Bugfix in OrxonoxConfig.h.in
• Looking for stdint.h instead of cstdint to have uint32_t, etc. on tardis

Location:

code/branches/buildsystem2

Files:

• cmake/BuildConfig.cmake (modified) (1 diff)
• media/CMakeLists.txt (modified) (1 diff)
• src/CMakeLists.txt (modified) (1 diff)
• src/OrxonoxConfig.h.in (modified) (4 diffs)

code/branches/buildsystem2/cmake/BuildConfig.cmake

@@ -29 +29 @@
 # Set binary output directories
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 # Sets where to find the external libraries like OgreMain.dll at runtime

code/branches/buildsystem2/media/CMakeLists.txt

@@ -26 +26 @@
 # Specify media directory
 FIND_PATH(ORXONOX_MEDIA_DIRECTORY resources.cfg
-  PATHS . ../../media $ENV{ORXONOX_MEDIA_DIR}
+  PATHS
+    ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_SOURCE_DIR}/../media
+        $ENV{ORXONOX_MEDIA_DIR}
 )
 IF(NOT ORXONOX_MEDIA_DIRECTORY)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -64 +64 @@
 # Check ciso646 include (operators in words)
 INCLUDE(CheckIncludeFileCXX)
-CHECK_INCLUDE_FILE_CXX(cstdint HAVE_CSTDINT)
-CHECK_INCLUDE_FILE_CXX(cstddef HAVE_CSTDDEF)
-CHECK_INCLUDE_FILE_CXX(ciso646 HAVE_CISO646)
+CHECK_INCLUDE_FILE_CXX(iso646.h HAVE_ISO646_H)
 
 SET(GENERATED_FILE_COMMENT

code/branches/buildsystem2/src/OrxonoxConfig.h.in

@@ -144 +144 @@
 /* Define the english written operators like and, or, xor
  * This is C++ standard, but the Microsoft compiler doesn't define them. */
-#cmakedefine HAVE_CISO646
-#ifdef HAVE_CISO646
-#  include <ciso646>
-#endif
-
-#cmakedefine HAVE_CSTDINT
-#ifdef HAVE_CSTDINT
-#  include <cstdint>
+#cmakedefine HAVE_ISO646_H
+#ifdef HAVE_ISO646_H
+#  include <iso646.h>
+#endif
+
+#cmakedefine HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
+#  include <stdint.h>
 #elif defined(ORXONOX_COMPILER_MSVC)
 typedef __int8            int8_t;
@@ -163 +163 @@
 #endif
 
-#cmakedefine HAVE_CSTDDEF
-#ifdef HAVE_CSTDDEF
-#  include <cstddef>
+#cmakedefine HAVE_STDDEF_H
+#ifdef HAVE_STDDEF_H
+#  include <stddef.h>
 #endif
 
@@ -201 +201 @@
 #  ifdef USE_DEPENDENCY_PACKAGE
     const char* const ORXONOX_OGRE_PLUGINS_FOLDER(".");
-#  elif
+#  else
     const char* const ORXONOX_OGRE_PLUGINS_FOLDER("@OGRE_PLUGINS_FOLDER_RELEASE@");
 #  endif
@@ -208 +208 @@
 #  ifdef USE_DEPENDENCY_PACKAGE
     const char* const ORXONOX_OGRE_PLUGINS_FOLDER(".");
-#  elif
+#  else
     const char* const ORXONOX_OGRE_PLUGINS_FOLDER("@OGRE_PLUGINS_FOLDER_DEBUG@");
 #  endif