From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Wed, 11 Sep 2013 17:04:10 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/all_map_pk3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d4d35ed2a95ae52c8c1478df35aa13896554e4e3;p=xonotic%2Fxonotic.git

Merge branch 'master' into matthiaskrgr/all_map_pk3

Conflicts:
	misc/tools/all/xonotic.subr
---

d4d35ed2a95ae52c8c1478df35aa13896554e4e3
diff --cc misc/tools/all/xonotic.subr
index 39d48ae7,63f7efbd..e140fdd4
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@@ -3,17 -3,16 +3,17 @@@ case "$cmd" i
  	update-maps)
  		misc/tools/xonotic-map-compiler-autobuild download
  		;;
 -	compile-map)
 +	compile-map-pk3)
  		if [ $# -eq 0 ] ; then
 -			msg "Usage: ./all compile-map mapname1 mapname2 mapname3"
 -			msg "For example: ./all compile-map dance xoylent"
 +			msg "Usage: ./all compile-map-pk3 mapname1 mapname2 mapname3"
 +			msg "For example: ./all compile-map-pk3 dance xoylent"
  		fi
- 		if ! [ -f "netradiant/install/q3map2.x86" ] ; then
- 			msg "q3map2 needed! Building..."
- 			make -C netradiant install/q3map2.x86
+ 		if ! [ -f "netradiant/install/q3map2" ] ; then
+ 			msg "q3map2 needed! Building netradiant..."
+ 			make -C netradiant install/q3map2
  		fi
  		for mapfile in "$@"; do
 +			mapname=$mapfile
  			mapfile="data/xonotic-maps.pk3dir/maps/$mapfile.map"
  			if [ ! -f "$mapfile" ] ; then
  				msg "ERROR, $mapfile not found!"