mirror of
https://github.com/Q3Rally-Team/q3rally.git
synced 2024-11-22 03:51:23 +00:00
Restore run script changes reverted in r101.
This commit is contained in:
parent
a1670788ff
commit
17913ac668
2 changed files with 16 additions and 18 deletions
15
run-debug.sh
15
run-debug.sh
|
@ -8,15 +8,16 @@ BUILD=debug
|
||||||
BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally.$ARCH
|
BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally.$ARCH
|
||||||
|
|
||||||
if [ ! -f $BIN ]; then
|
if [ ! -f $BIN ]; then
|
||||||
echo "Game binary '$BIN' not found!"
|
echo "Game binary '$BIN' not found, building it..."
|
||||||
echo "Run 'make -C engine $BUILD' to build it."
|
make -C engine $BUILD BUILD_GAME_QVM=0 BUILD_SERVER=0
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -f baseq3r/vm/ui.qvm ]; then
|
# Create links to game logic natives
|
||||||
echo "QVMs not found!"
|
if [ ! -f baseq3r/ui$ARCH.so ]; then
|
||||||
echo "Run 'cp engine/build/$BUILD-$PLATFORM-$ARCH/baseq3r/vm/*.qvm baseq3r/vm/'"
|
DIR=`pwd`
|
||||||
exit 1
|
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
|
fi
|
||||||
|
|
||||||
# Run the game
|
# Run the game
|
||||||
|
|
19
run.sh
19
run.sh
|
@ -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/`
|
ARCH=`uname -m | sed -e s/i.86/i386/`
|
||||||
BUILD=release
|
BUILD=release
|
||||||
|
|
||||||
BIN=q3rally.$ARCH
|
|
||||||
|
|
||||||
if [ ! -f $BIN ]; then
|
|
||||||
BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally.$ARCH
|
BIN=engine/build/$BUILD-$PLATFORM-$ARCH/q3rally.$ARCH
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f $BIN ]; then
|
if [ ! -f $BIN ]; then
|
||||||
echo "Game binary '$BIN' not found!"
|
echo "Game binary '$BIN' not found, building it..."
|
||||||
echo "Run 'make -C engine' to build it."
|
make -C engine BUILD_GAME_SO=0 BUILD_SERVER=0
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Create links to game logic qvms
|
||||||
if [ ! -f baseq3r/vm/ui.qvm ]; then
|
if [ ! -f baseq3r/vm/ui.qvm ]; then
|
||||||
echo "QVMs not found!"
|
DIR=`pwd`
|
||||||
echo "Run 'cp engine/build/$BUILD-$PLATFORM-$ARCH/baseq3r/vm/*.qvm baseq3r/vm/'"
|
ln -st "$DIR/baseq3r/vm/" "$DIR/engine/build/$BUILD-$PLATFORM-$ARCH/baseq3r/vm/cgame.qvm"
|
||||||
exit 1
|
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
|
fi
|
||||||
|
|
||||||
# Run the game
|
# 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 $@
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue