X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=cebe6e70b858879183a5897029813d8b9aab9553;hp=6380df5cb9534c1d3e2db6c7d48b1187cb631254;hb=6579006248964a9189fe95af4ed28bb6b3724222;hpb=836750e43353e45b536d50bda1df97f5d8279d0e

diff --git a/all b/all
index 6380df5c..cebe6e70 100755
--- a/all
+++ b/all
@@ -946,13 +946,13 @@ case "$cmd" in
 		"$SELF" release-compile linux32 \
 			'CC="gcc -m32 -g -Wl,--hash-style=sysv -I$HOME/dp.linux32/include -L$HOME/dp.linux32/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux32/lib DP_LINK_TO_LIBJPEG=1' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
-			debug 'darkplaces-glx:Xonotic/xonotic-linux-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
+			debug 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
 		;;
 	release-engine-linux64)
 		"$SELF" release-compile linux64 \
 			'CC="gcc -m64 -g -Wl,--hash-style=sysv -I$HOME/dp.linux64/include -L$HOME/dp.linux64/lib" DP_MODPLUG_STATIC_LIBDIR=$HOME/dp.linux64/lib DP_LINK_TO_LIBJPEG=1' \
 			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux64' \
-			debug 'darkplaces-glx:Xonotic/xonotic-linux-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
+			debug 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
 		;;
 	release-engine)
 		"$SELF" release-engine-win32 &
@@ -984,7 +984,7 @@ case "$cmd" in
 		export do_dds=true
 		export dds_flags=
 		export do_ogg=false
-		find models textures -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
+		find models textures maps/*/ -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;
 	release-buildpk3-transform-low)
 		dir=$1
@@ -997,7 +997,20 @@ case "$cmd" in
 		export do_dds=false
 		export do_ogg=true
 		export ogg_qual=1
-		find models textures sound/cdtracks -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
+		find models textures maps/*/ sound -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
+		;;
+	release-buildpk3-transform-lowdds)
+		dir=$1
+		cd "$dir"
+		# texture: convert to jpeg and dds
+		# music: reduce bitrate
+		export do_jpeg=false
+		export do_dds=true
+		export dds_flags=
+		export do_ogg=true
+		export ogg_qual=1
+		export del_src=true
+		find models textures maps/*/ sound -type f -print0 | xargs -0 "$d0"/misc/tools/cached-converter.sh
 		;;
 	release-buildpk3)
 		src=$1
@@ -1028,8 +1041,8 @@ case "$cmd" in
 			for X in data/*-????????????????????????????????????????-????????????????????????????????????????.pk3; do
 				if [ -f "$X" ]; then
 					(
-						cd Xonotic/data/xonotic-maps.pk3dir
-						unzip ../../../"$X"
+						cd Xonotic/temp
+						unzip ../../"$X"
 					)
 				fi
 			done
@@ -1051,10 +1064,10 @@ case "$cmd" in
 		;;
 	release-pack)
 		"$SELF" release-buildpk3s data/font-nimbussansl.pk3dir             raw ''
-		"$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '' raw '-raw' low '-low'
-		"$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '' raw '-raw' low '-low'
-		"$SELF" release-buildpk3s data/xonotic-music.pk3dir      normal '' raw '-raw' low '-low'
-		"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
+		"$SELF" release-buildpk3s data/xonotic-data.pk3dir       normal '' raw '-raw' low '-low' lowdds '-lowdds'
+		"$SELF" release-buildpk3s data/xonotic-maps.pk3dir       normal '' raw '-raw' low '-low' lowdds '-lowdds'
+		"$SELF" release-buildpk3s data/xonotic-music.pk3dir                raw ''     low '-low'
+		"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''     lowdds '-lowdds'
 		;;
 	release-pack-needsx11)
 		case "$DISPLAY" in