Restore run script changes reverted in r101.

This commit is contained in:
zturtleman 2011-08-10 20:04:11 +00:00
parent a1670788ff
commit 17913ac668
2 changed files with 16 additions and 18 deletions

View file

@ -8,15 +8,16 @@ BUILD=debug
BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally.$ARCH
if [ ! -f $BIN ]; then
echo "Game binary '$BIN' not found!"
echo "Run 'make -C engine $BUILD' to build it."
exit 1
echo "Game binary '$BIN' not found, building it..."
make -C engine $BUILD BUILD_GAME_QVM=0 BUILD_SERVER=0
fi
if [ ! -f baseq3r/vm/ui.qvm ]; then
echo "QVMs not found!"
echo "Run 'cp engine/build/$BUILD-$PLATFORM-$ARCH/baseq3r/vm/*.qvm baseq3r/vm/'"
exit 1
# Create links to game logic natives
if [ ! -f baseq3r/ui$ARCH.so ]; then
DIR=`pwd`
ln -st "$DIR/baseq3r/" "$DIR/engine/build/$BUILD-$PLATFORM-$ARCH/baseq3r/cgame$ARCH.so"
ln -st "$DIR/baseq3r/" "$DIR/engine/build/$BUILD-$PLATFORM-$ARCH/baseq3r/qagame$ARCH.so"
ln -st "$DIR/baseq3r/" "$DIR/engine/build/$BUILD-$PLATFORM-$ARCH/baseq3r/ui$ARCH.so"
fi
# Run the game

19
run.sh
View file

@ -5,24 +5,21 @@ PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'|sed -e 's/\//_/g'`
ARCH=`uname -m | sed -e s/i.86/i386/`
BUILD=release
BIN=q3rally.$ARCH
if [ ! -f $BIN ]; then
BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally.$ARCH
fi
if [ ! -f $BIN ]; then
echo "Game binary '$BIN' not found!"
echo "Run 'make -C engine' to build it."
exit 1
echo "Game binary '$BIN' not found, building it..."
make -C engine BUILD_GAME_SO=0 BUILD_SERVER=0
fi
# Create links to game logic qvms
if [ ! -f baseq3r/vm/ui.qvm ]; then
echo "QVMs not found!"
echo "Run 'cp engine/build/$BUILD-$PLATFORM-$ARCH/baseq3r/vm/*.qvm baseq3r/vm/'"
exit 1
DIR=`pwd`
ln -st "$DIR/baseq3r/vm/" "$DIR/engine/build/$BUILD-$PLATFORM-$ARCH/baseq3r/vm/cgame.qvm"
ln -st "$DIR/baseq3r/vm/" "$DIR/engine/build/$BUILD-$PLATFORM-$ARCH/baseq3r/vm/qagame.qvm"
ln -st "$DIR/baseq3r/vm/" "$DIR/engine/build/$BUILD-$PLATFORM-$ARCH/baseq3r/vm/ui.qvm"
fi
# Run the game
./$BIN +set fs_basepath "." +set vm_game 0 +set vm_cgame 0 +set vm_ui 0 $@
./$BIN +set fs_basepath "." +set vm_game 2 +set vm_cgame 2 +set vm_ui 2 $@