Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 12, 2009, 4:24:59 PM (16 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:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem2/cmake/BuildConfig.cmake

    r2644 r2650  
    2929# Set binary output directories
    3030SET(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)
     31SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
     32SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
    3333
    3434# Sets where to find the external libraries like OgreMain.dll at runtime
  • code/branches/buildsystem2/media/CMakeLists.txt

    r2644 r2650  
    2626# Specify media directory
    2727FIND_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}
    2932)
    3033IF(NOT ORXONOX_MEDIA_DIRECTORY)
  • code/branches/buildsystem2/src/CMakeLists.txt

    r2640 r2650  
    6464# Check ciso646 include (operators in words)
    6565INCLUDE(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)
     66CHECK_INCLUDE_FILE_CXX(iso646.h HAVE_ISO646_H)
    6967
    7068SET(GENERATED_FILE_COMMENT
  • code/branches/buildsystem2/src/OrxonoxConfig.h.in

    r2645 r2650  
    144144/* Define the english written operators like and, or, xor
    145145 * This is C++ standard, but the Microsoft compiler doesn't define them. */
    146 #cmakedefine HAVE_CISO646
    147 #ifdef HAVE_CISO646
    148 #  include <ciso646>
    149 #endif
    150 
    151 #cmakedefine HAVE_CSTDINT
    152 #ifdef HAVE_CSTDINT
    153 #  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>
    154154#elif defined(ORXONOX_COMPILER_MSVC)
    155155typedef __int8            int8_t;
     
    163163#endif
    164164
    165 #cmakedefine HAVE_CSTDDEF
    166 #ifdef HAVE_CSTDDEF
    167 #  include <cstddef>
     165#cmakedefine HAVE_STDDEF_H
     166#ifdef HAVE_STDDEF_H
     167#  include <stddef.h>
    168168#endif
    169169
     
    201201#  ifdef USE_DEPENDENCY_PACKAGE
    202202    const char* const ORXONOX_OGRE_PLUGINS_FOLDER(".");
    203 #  elif
     203#  else
    204204    const char* const ORXONOX_OGRE_PLUGINS_FOLDER("@OGRE_PLUGINS_FOLDER_RELEASE@");
    205205#  endif
     
    208208#  ifdef USE_DEPENDENCY_PACKAGE
    209209    const char* const ORXONOX_OGRE_PLUGINS_FOLDER(".");
    210 #  elif
     210#  else
    211211    const char* const ORXONOX_OGRE_PLUGINS_FOLDER("@OGRE_PLUGINS_FOLDER_DEBUG@");
    212212#  endif
Note: See TracChangeset for help on using the changeset viewer.