X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=016300b61207f0ca87949e4f8234433475b6e84d;hp=50904c9d356caba8e43b748139f7d255029606d8;hb=324e8f3f9b61e182f4209949a9409a3eeb0873a4;hpb=ffe894651bcf499b35be3aa6ed37ae202abac489;ds=sidebyside

diff --git a/all b/all
index 50904c9d..016300b6 100755
--- a/all
+++ b/all
@@ -988,10 +988,10 @@ case "$cmd" in
 	release-qc)
 		case "$RELEASETYPE" in
 			beta)
-				verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK= clean all
+				verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 clean all
 				;;
 			release)
-				verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" FTEQCCFLAGS_WATERMARK= clean all
+				verbose make -C Xonotic/source FTEQCC="$d0/Xonotic/fteqcc/fteqcc.linux32" XON_BUILDSYSTEM=1 FTEQCCFLAGS_WATERMARK= clean all
 				;;
 		esac
 		verbose rm -f Xonotic/source/*/fteqcc.log
@@ -1041,9 +1041,6 @@ case "$cmd" in
 		verbose export ogg_qual=1
 		verbose export del_src=true
 		find . -type f -print0 | verbose xargs -0 "$d0"/misc/tools/cached-converter.sh
-		if [ -f "quake.rc" ]; then
-			verbose echo "r_texture_dds_load 1" >> quake.rc
-		fi
 		;;
 	release-buildpk3)
 		src=$1
@@ -1067,9 +1064,9 @@ case "$cmd" in
 		}
 		verbose cd Xonotic/temp
 		if [ x"$src" = x"data/xonotic-data.pk3dir" ]; then
-			verbose cp ../progs.dat .
-			verbose cp ../csprogs.dat .
-			verbose cp ../menu.dat .
+			verbose cp ../source/progs.dat .
+			verbose cp ../source/csprogs.dat .
+			verbose cp ../source/menu.dat .
 			verbose rm -rf qcsrc
 			gv=`grep "^gameversion " "defaultXonotic.cfg" | awk '{ print $2 }'`
 			major=$(($gv / 10000))
@@ -1133,7 +1130,7 @@ case "$cmd" in
 		stamp=`cat Xonotic/stamp.txt`
 		verbose zip -9yr Xonotic-common.zip \
 			Xonotic/*.dll \
-			Xonotic/source \
+			Xonotic/source/*/ \
 			Xonotic/Docs \
 			Xonotic/misc \
 			Xonotic/fteqcc \