Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2243


Ignore:
Timestamp:
Nov 21, 2008, 12:22:22 AM (15 years ago)
Author:
rgrieder
Message:
  • Inserted IF when copying the config files from bin/ so existing files don't get overwritten.
  • Reorganised everything around the run-script: There are now folders in bin/ for each kind of distribution (tardis, linux, msvc and mingw). CMake will then copy the right files to the binary folder.
  • Removed ugly parts in the run-script since tardis now got its own one.
Location:
code/branches/buildsystem
Files:
4 added
1 deleted
2 edited
1 copied
4 moved

Legend:

Unmodified
Added
Removed
  • code/branches/buildsystem/bin/CMakeLists.txt

    r2241 r2243  
    11SET(CONFIG_FILES
    2     def_keybindings.ini
    3     disco.txt
    4     irc.tcl
    5     ogre.cfg-init
    6     orxonox.bat
    7     Plugins.cfg
    8     plugins.cfg-init
    9     remote.tcl
    10     run-script
    11     telnet_server.tcl
     2  def_keybindings.ini
     3  disco.txt
     4  irc.tcl
     5  remote.tcl
     6  telnet_server.tcl
    127)
    138
     9IF(IS_TARDIS)
     10  SET(CONFIG_FILES ${CONFIG_FILES}
     11    linux/run-script
     12        tardis/plugins.cfg
     13  )
     14
     15ELSEIF(UNIX)
     16  SET(CONFIG_FILES ${CONFIG_FILES}
     17    linux/run-script
     18        linux/plugins.cfg
     19  )
     20ENDIF(IS_TARDIS)
     21
     22IF(MINGW)
     23  SET(CONFIG_FILES ${CONFIG_FILES}
     24    "mingw/plugins.cfg"
     25    "mingw/orxonox.bat"
     26  )
     27ENDIF(MINGW)
     28
    1429FOREACH(_FILE ${CONFIG_FILES})
    15     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_FILE} ${EXECUTABLE_OUTPUT_PATH}/${_FILE} COPYONLY)
     30  GET_FILENAME_COMPONENT(_filename ${_FILE} NAME)
     31  IF (NOT EXISTS ${EXECUTABLE_OUTPUT_PATH}/${_filename})
     32    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${_FILE} ${EXECUTABLE_OUTPUT_PATH}/${_filename} COPYONLY)
     33  ENDIF (NOT EXISTS ${EXECUTABLE_OUTPUT_PATH}/${_filename})
    1634ENDFOREACH(_FILE)
  • code/branches/buildsystem/bin/linux/plugins.cfg

    r2235 r2243  
    88Plugin=RenderSystem_GL
    99Plugin=Plugin_ParticleFX
    10 Plugin=Plugin_BSPSceneManager
    11 Plugin=Plugin_OctreeSceneManager
    12 #Plugin=Plugin_CgProgramManager
     10Plugin=Plugin_CgProgramManager
     11#Plugin=Plugin_BSPSceneManager
     12#Plugin=Plugin_OctreeSceneManager
    1313
    1414
  • code/branches/buildsystem/bin/linux/run-script

    r2235 r2243  
    88fi
    99
    10 if [ ! -f orge.cfg ]; then
    11         cp ogre.cfg-init ogre.cfg
    12 fi
    13 
    14 # check if plugins.cfg exists, and of not create it
    15 # and modify
    16 if [ ! -f plugins.cfg ]; then
    17         if uname -n | grep -q "tardis"; then
    18                 sed -e 's:PluginFolder=/usr/lib/OGRE:PluginFolder=/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/OGRE/:' \
    19                 -e 's:#Plugin=Plugin_CgProgramManager:Plugin=Plugin_CgProgramManager:' plugins.cfg-init > plugins.cfg
    20         else
    21                 cp plugins.cfg-init plugins.cfg
    22         fi
    23 fi
    24 
    2510trap "xset r && echo 'resetting autorepeat'" HUP INT TERM QUIT ABRT KILL ALRM
    2611./orxonox $@
  • code/branches/buildsystem/bin/mingw/orxonox.bat

    r2235 r2243  
    11title Orxonox
    2 path lib;..\..\libs;%path%
     2path ..\..\libs;%path%
    33orxonox.exe
    44pause
  • code/branches/buildsystem/bin/mingw/plugins.cfg

    r2235 r2243  
    22
    33# Define plugin folder
    4 PluginFolder=..\..\libs\ogre\Samples\Common\bin\Release
     4PluginFolder=..\..\libs\ogre\Samples\Common\bin\Release\
    55
    66# Define plugins
     
    88Plugin=RenderSystem_GL
    99Plugin=Plugin_ParticleFX
    10 Plugin=Plugin_BSPSceneManager
    11 Plugin=Plugin_OctreeSceneManager
    12 #Plugin=Plugin_CgProgramManager
     10Plugin=Plugin_CgProgramManager
     11#Plugin=Plugin_BSPSceneManager
     12#Plugin=Plugin_OctreeSceneManager
    1313
  • code/branches/buildsystem/bin/tardis/plugins.cfg

    r2235 r2243  
    22
    33# Define plugin folder
    4 PluginFolder=/usr/lib/OGRE
     4PluginFolder=/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/OGRE/
    55
    66# Define plugins
     
    88Plugin=RenderSystem_GL
    99Plugin=Plugin_ParticleFX
    10 Plugin=Plugin_BSPSceneManager
    11 Plugin=Plugin_OctreeSceneManager
    12 #Plugin=Plugin_CgProgramManager
     10Plugin=Plugin_CgProgramManager
     11#Plugin=Plugin_BSPSceneManager
     12#Plugin=Plugin_OctreeSceneManager
    1313
    1414
  • code/branches/buildsystem/cmake/UseTolua.cmake

    r2241 r2243  
    4343                                  -s "${TOLUA_PARSER_SOURCE}"
    4444                                     "${_tolua_pkgfile}"
    45     DEPENDS "${_tolua_executable_name}" ${_tolua_inputfiles} ${TOLUA_PARSER_DEPENDENCIES}
     45    DEPENDS "${_tolua_executable_name}" ${TOLUA_PARSER_DEPENDENCIES}
     46    IMPLICIT_DEPENDS CXX ${_tolua_inputfiles}
    4647    WORKING_DIRECTORY "${LIBRARY_OUTPUT_PATH}"
    4748  )
Note: See TracChangeset for help on using the changeset viewer.