Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2199 for code


Ignore:
Timestamp:
Nov 12, 2008, 4:09:01 PM (16 years ago)
Author:
adrfried
Message:

paths modified, orxonox runs out of the build directory

Location:
code/branches/buildsystem
Files:
1 added
4 edited

Legend:

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

    r2197 r2199  
    6565# Add main source dir
    6666ADD_SUBDIRECTORY(src)
     67ADD_SUBDIRECTORY(bin)
  • code/branches/buildsystem/bin/run-script

    r1735 r2199  
    1 #!/bin/bash
     1#!/bin/sh
    22
    3 if [[ !  -f orxonox ]] ; then
     3if [ ! -f orxonox ]; then
    44        echo "orxonox does not exist"
    55        echo "did you compile it?"
     
    88fi
    99
    10 if [[ -ne orge.cfg ]] ; then
     10if [ ! -f orge.cfg ]; then
    1111        cp ogre.cfg-init ogre.cfg
    1212fi
     
    1414# check if plugins.cfg exists, and of not create it
    1515# and modify
    16 if [[ ! -f plugins.cfg ]] ; then
    17         if uname -n | grep "tardis" > /dev/null ; then
     16if [ ! -f plugins.cfg ]; then
     17        if uname -n | grep -q "tardis"; then
    1818                sed -e 's:PluginFolder=/usr/lib/OGRE:PluginFolder=/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/OGRE/:' \
    1919                -e 's:#Plugin=Plugin_CgProgramManager:Plugin=Plugin_CgProgramManager:' plugins.cfg-init > plugins.cfg
  • code/branches/buildsystem/run

    r1506 r2199  
    1 #!/bin/bash
    2 cd bin
    3 ./run-script $@
    4 cd ..
     1#!/bin/sh
     2# convenience script for starting orxonox
     3
     4cd build/bin && exec ./run-script $@
  • code/branches/buildsystem/src/orxonox/Settings.cc

    r1755 r2199  
    6464    void Settings::setConfigValues()
    6565    {
    66         SetConfigValue(dataPath_, "../../Media/").description("Relative path to the game data.").callback(this, &Settings::dataPathChanged);
     66        SetConfigValue(dataPath_, "../../../Media/").description("Relative path to the game data.").callback(this, &Settings::dataPathChanged);
    6767    }
    6868
Note: See TracChangeset for help on using the changeset viewer.