Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 14, 2009, 6:11:32 PM (16 years ago)
Author:
rgrieder
Message:

Merged the build system changes from the Gruppenarbeit:

  • More Comments (including Doxygen stuff for the config files)
  • Removed redundancy between PackageConfigMSVC.cmake and PackageConfigMinGW.cmake
  • Option ORXONOX_RELEASE which activates some expensive (build time) optimisations
  • Native Visual Leak Detector support (doesn't work for MSVC9 though)
  • Added CMake option to disable the console on Windows
File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/pch/src/SpecialConfig.h.in

    r2946 r3167  
    2828
    2929/**
    30  @file
    31  @brief
     30@file
     31@brief
    3232    Various constants and options that only affect very little code.
    33  @note
     33@note
    3434    This is merely to avoid recompiling everything when only a path changes.
    35 
     35@remarks
    3636    @GENERATED_FILE_COMMENT@
    37  */
     37*/
    3838
    3939#ifndef _SpecialConfig_H__
    … …  
    4242#include "OrxonoxConfig.h"
    4343
    44 /* Set whether we must suffix "ceguilua/" for the CEGUILua.h include */
     44/**
     45@def CEGUILUA_USE_INTERNAL_LIBRARY
     46    Set whether we must suffix "ceguilua/" for the CEGUILua.h include
     47*/
    4548#cmakedefine CEGUILUA_USE_INTERNAL_LIBRARY
    4649
    47 /* Defined if a precompiled depdency package was used. We then copy all libraries
    48    too when installing. */
     50/**
     51@def DEPENDENCY_PACKAGE_ENABLE
     52    Defined if a precompiled depdency package was used. We then copy all libraries
     53    too when installing.
     54*/
    4955#cmakedefine DEPENDENCY_PACKAGE_ENABLE
    5056
    51 /* Orxonox either gets installed to the system or just into a folder.
    52    The latter uses relative paths. */
     57/**
     58@def INSTALL_COPYABLE
     59    Orxonox either gets installed to the system or just into a folder.
     60    The latter uses relative paths.
     61*/
    5362#cmakedefine INSTALL_COPYABLE
    5463
    55 /* Using MSVC or XCode IDE */
     64/**
     65@def CMAKE_CONFIGURATION_TYPES
     66    Using MSVC or XCode IDE
     67*/
    5668#cmakedefine CMAKE_CONFIGURATION_TYPES
    5769
    58 /* Handle default ConfigValues */
     70// Handle default ConfigValues
    5971namespace orxonox
    6072{
    61     const char* const ORXONOX_RUNTIME_INSTALL_PATH("@ORXONOX_RUNTIME_INSTALL_PATH@");
    62     const char* const ORXONOX_MEDIA_INSTALL_PATH  ("@ORXONOX_MEDIA_INSTALL_PATH@");
     73    // INSTALLATION PATHS
     74    const char ORXONOX_RUNTIME_INSTALL_PATH[] = "@ORXONOX_RUNTIME_INSTALL_PATH@";
     75    const char ORXONOX_MEDIA_INSTALL_PATH[]   = "@ORXONOX_MEDIA_INSTALL_PATH@";
    6376    /* Config and Log path might be relative because they could be user and therefore runtime dependent */
    64     const char* const ORXONOX_CONFIG_INSTALL_PATH ("@ORXONOX_CONFIG_INSTALL_PATH@");
    65     const char* const ORXONOX_LOG_INSTALL_PATH    ("@ORXONOX_LOG_INSTALL_PATH@");
     77    const char ORXONOX_CONFIG_INSTALL_PATH[]  = "@ORXONOX_CONFIG_INSTALL_PATH@";
     78    const char ORXONOX_LOG_INSTALL_PATH[]     = "@ORXONOX_LOG_INSTALL_PATH@";
    6679
    67     const char* const ORXONOX_MEDIA_DEV_PATH      ("@CMAKE_MEDIA_OUTPUT_DIRECTORY@");
     80    // DEVELOPMENT RUN PATHS
     81    const char ORXONOX_MEDIA_DEV_PATH[]       = "@CMAKE_MEDIA_OUTPUT_DIRECTORY@";
    6882#ifdef CMAKE_CONFIGURATION_TYPES
    69     const char* const ORXONOX_CONFIG_DEV_PATH     ("@CMAKE_CONFIG_OUTPUT_DIRECTORY@/" MACRO_QUOTEME(CMAKE_BUILD_TYPE));
    70     const char* const ORXONOX_LOG_DEV_PATH        ("@CMAKE_LOG_OUTPUT_DIRECTORY@/"    MACRO_QUOTEME(CMAKE_BUILD_TYPE));
     83    const char ORXONOX_CONFIG_DEV_PATH[]      = "@CMAKE_CONFIG_OUTPUT_DIRECTORY@/" MACRO_QUOTEME(CMAKE_BUILD_TYPE);
     84    const char ORXONOX_LOG_DEV_PATH[]         = "@CMAKE_LOG_OUTPUT_DIRECTORY@/"    MACRO_QUOTEME(CMAKE_BUILD_TYPE);
    7185#else
    72     const char* const ORXONOX_CONFIG_DEV_PATH     ("@CMAKE_CONFIG_OUTPUT_DIRECTORY@");
    73     const char* const ORXONOX_LOG_DEV_PATH        ("@CMAKE_LOG_OUTPUT_DIRECTORY@");
     86    const char ORXONOX_CONFIG_DEV_PATH[]      = "@CMAKE_CONFIG_OUTPUT_DIRECTORY@";
     87    const char ORXONOX_LOG_DEV_PATH[]         = "@CMAKE_LOG_OUTPUT_DIRECTORY@";
    7488#endif
    7589   
    7690    /* OGRE Plugins */
    7791#ifdef NDEBUG
    78     const char* const ORXONOX_OGRE_PLUGINS("@OGRE_PLUGINS_RELEASE@");
     92    const char ORXONOX_OGRE_PLUGINS[] = "@OGRE_PLUGINS_RELEASE@";
    7993#  ifdef DEPENDENCY_PACKAGE_ENABLE
    80     const char* const ORXONOX_OGRE_PLUGINS_FOLDER(".");
     94    const char ORXONOX_OGRE_PLUGINS_FOLDER[] = ".";
    8195#  else
    82     const char* const ORXONOX_OGRE_PLUGINS_FOLDER("@OGRE_PLUGINS_FOLDER_RELEASE@");
     96    const char ORXONOX_OGRE_PLUGINS_FOLDER[] = "@OGRE_PLUGINS_FOLDER_RELEASE@";
    8397#  endif
    8498#else
    85     const char* const ORXONOX_OGRE_PLUGINS("@OGRE_PLUGINS_DEBUG@");
     99    const char ORXONOX_OGRE_PLUGINS[] = "@OGRE_PLUGINS_DEBUG@";
    86100#  ifdef DEPENDENCY_PACKAGE_ENABLE
    87     const char* const ORXONOX_OGRE_PLUGINS_FOLDER(".");
     101    const char ORXONOX_OGRE_PLUGINS_FOLDER[] = ".";
    88102#  else
    89     const char* const ORXONOX_OGRE_PLUGINS_FOLDER("@OGRE_PLUGINS_FOLDER_DEBUG@");
     103    const char ORXONOX_OGRE_PLUGINS_FOLDER[] = "@OGRE_PLUGINS_FOLDER_DEBUG@";
    90104#  endif
    91105#endif
    92106}
    93107
     108/**
     109@def ORXONOX_USE_WINMAIN
     110    Use main() or WinMain()?
     111*/
     112#cmakedefine ORXONOX_USE_WINMAIN
     113
    94114#endif /* _SpecialConfig_H__ */
Note: See TracChangeset for help on using the changeset viewer.