Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic

This commit is contained in:
Rudolf Polzer 2012-01-30 17:01:43 +01:00
commit 432429d952
2 changed files with 6 additions and 5 deletions

View File

@ -26,7 +26,7 @@ goto postarg
if exist data\the-big-benchmark.log del data\the-big-benchmark.log
if exist data\benchmark.log del data\benchmark.log
if exist data\engine.log del data\engine.log
set p=+developer 1 -nohome -benchmarkruns 4 -benchmarkruns_skipfirst -benchmark demos/the-big-keybench.dem
set p=+r_texture_dds_load 1 +developer 1 -nohome -benchmarkruns 4 -benchmarkruns_skipfirst -benchmark demos/the-big-keybench.dem
if exist data\benchmark.log del data\benchmark.log
echo + %xonotic% %2 %3 %4 %5 %6 %7 %8 %9 +exec effects-omg.cfg %p% > data\engine.log

View File

@ -12,7 +12,8 @@ echo " ================="
echo
if [ -f ./all ]; then
echo "WARNING: running this script will destroy ANY local changes you"
echo "might have on the repository that haven't been pushed yet."
echo "might have on the repository that haven't been pushed or stored"
echo "in a local branch yet."
echo
if [ x"$1" != x"--yes" ]; then
echo "Are you absolutely sure you want to run this?"
@ -34,7 +35,7 @@ if [ -f ./all ]; then
fi
if [ -f ./all ]; then
./all clean --reclone
./all clean -fU -m -r
./all compile -r
export USE_GDB=no
set -- ./all run "$@"
@ -58,7 +59,7 @@ fi
rm -f data/the-big-benchmark.log
rm -f data/benchmark.log
rm -f data/engine.log
p="+developer 1 -nohome -benchmarkruns 4 -benchmarkruns_skipfirst -benchmark demos/the-big-keybench.dem"
p="+r_texture_dds_load 1 +developer 1 -nohome -benchmarkruns 4 -benchmarkruns_skipfirst -benchmark demos/the-big-keybench.dem"
for e in omg low med normal high ultra ultimate; do
rm -f data/benchmark.log
echo + "$@" +exec effects-$e.cfg $p > data/engine.log
@ -70,7 +71,7 @@ for e in omg low med normal high ultra ultimate; do
cat data/benchmark.log >> data/the-big-benchmark.log
done
if [ -f ./all ]; then
./all clean -r -f -u
./all clean -r
fi
rm -f data/benchmark.log