Changeset 2650 for code/branches/buildsystem2
- Timestamp:
- Feb 12, 2009, 4:24:59 PM (16 years ago)
- Location:
- code/branches/buildsystem2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/buildsystem2/cmake/BuildConfig.cmake
r2644 r2650 29 29 # Set binary output directories 30 30 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) 31 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/ bin)32 SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/ bin)31 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) 32 SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) 33 33 34 34 # Sets where to find the external libraries like OgreMain.dll at runtime -
code/branches/buildsystem2/media/CMakeLists.txt
r2644 r2650 26 26 # Specify media directory 27 27 FIND_PATH(ORXONOX_MEDIA_DIRECTORY resources.cfg 28 PATHS . ../../media $ENV{ORXONOX_MEDIA_DIR} 28 PATHS 29 ${CMAKE_CURRENT_SOURCE_DIR} 30 ${CMAKE_SOURCE_DIR}/../media 31 $ENV{ORXONOX_MEDIA_DIR} 29 32 ) 30 33 IF(NOT ORXONOX_MEDIA_DIRECTORY) -
code/branches/buildsystem2/src/CMakeLists.txt
r2640 r2650 64 64 # Check ciso646 include (operators in words) 65 65 INCLUDE(CheckIncludeFileCXX) 66 CHECK_INCLUDE_FILE_CXX(cstdint HAVE_CSTDINT) 67 CHECK_INCLUDE_FILE_CXX(cstddef HAVE_CSTDDEF) 68 CHECK_INCLUDE_FILE_CXX(ciso646 HAVE_CISO646) 66 CHECK_INCLUDE_FILE_CXX(iso646.h HAVE_ISO646_H) 69 67 70 68 SET(GENERATED_FILE_COMMENT -
code/branches/buildsystem2/src/OrxonoxConfig.h.in
r2645 r2650 144 144 /* Define the english written operators like and, or, xor 145 145 * This is C++ standard, but the Microsoft compiler doesn't define them. */ 146 #cmakedefine HAVE_ CISO646147 #ifdef HAVE_ CISO646148 # include < ciso646>149 #endif 150 151 #cmakedefine HAVE_ CSTDINT152 #ifdef HAVE_ CSTDINT153 # include < cstdint>146 #cmakedefine HAVE_ISO646_H 147 #ifdef HAVE_ISO646_H 148 # include <iso646.h> 149 #endif 150 151 #cmakedefine HAVE_STDINT_H 152 #ifdef HAVE_STDINT_H 153 # include <stdint.h> 154 154 #elif defined(ORXONOX_COMPILER_MSVC) 155 155 typedef __int8 int8_t; … … 163 163 #endif 164 164 165 #cmakedefine HAVE_ CSTDDEF166 #ifdef HAVE_ CSTDDEF167 # include < cstddef>165 #cmakedefine HAVE_STDDEF_H 166 #ifdef HAVE_STDDEF_H 167 # include <stddef.h> 168 168 #endif 169 169 … … 201 201 # ifdef USE_DEPENDENCY_PACKAGE 202 202 const char* const ORXONOX_OGRE_PLUGINS_FOLDER("."); 203 # el if203 # else 204 204 const char* const ORXONOX_OGRE_PLUGINS_FOLDER("@OGRE_PLUGINS_FOLDER_RELEASE@"); 205 205 # endif … … 208 208 # ifdef USE_DEPENDENCY_PACKAGE 209 209 const char* const ORXONOX_OGRE_PLUGINS_FOLDER("."); 210 # el if210 # else 211 211 const char* const ORXONOX_OGRE_PLUGINS_FOLDER("@OGRE_PLUGINS_FOLDER_DEBUG@"); 212 212 # endif
Note: See TracChangeset
for help on using the changeset viewer.