Changeset 2199 for code/branches/buildsystem

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:

• CMakeLists.txt (modified) (1 diff)
• bin/CMakeLists.txt (added)
• bin/run-script (modified) (3 diffs)
• run (modified) (1 diff)
• src/orxonox/Settings.cc (modified) (1 diff)

code/branches/buildsystem/CMakeLists.txt

@@ -65 +65 @@
 # Add main source dir
 ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(bin)

code/branches/buildsystem/bin/run-script

@@ -1 @@
-#!/bin/bash
+#!/bin/sh
 
-if [[ !  -f orxonox ]] ; then
+if [ ! -f orxonox ]; then
         echo "orxonox does not exist"
         echo "did you compile it?"
@@ -8 +8 @@
 fi
 
-if [[ -ne orge.cfg ]] ; then
+if [ ! -f orge.cfg ]; then
         cp ogre.cfg-init ogre.cfg
 fi
@@ -14 +14 @@
 # check if plugins.cfg exists, and of not create it
 # and modify 
-if [[ ! -f plugins.cfg ]] ; then 
-        if uname -n | grep "tardis" > /dev/null ; then
+if [ ! -f plugins.cfg ]; then
+        if uname -n | grep -q "tardis"; then
                 sed -e 's:PluginFolder=/usr/lib/OGRE:PluginFolder=/usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/lib/OGRE/:' \
                 -e 's:#Plugin=Plugin_CgProgramManager:Plugin=Plugin_CgProgramManager:' plugins.cfg-init > plugins.cfg

code/branches/buildsystem/run

@@ -1 @@
-#!/bin/bash
-cd bin
-./run-script $@
-cd ..
+#!/bin/sh
+# convenience script for starting orxonox
+
+cd build/bin && exec ./run-script $@

code/branches/buildsystem/src/orxonox/Settings.cc

@@ -64 +64 @@
     void Settings::setConfigValues()
     {
-        SetConfigValue(dataPath_, "../../Media/").description("Relative path to the game data.").callback(this, &Settings::dataPathChanged);
+        SetConfigValue(dataPath_, "../../../Media/").description("Relative path to the game data.").callback(this, &Settings::dataPathChanged);
     }