X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=cdfcd0b5891b41cdcc3ba4196570d41fe95d4734;hp=2ff0c189bb62cd9964eb33053bea1a3955296ee1;hb=3dc917baad4248a380671613665f134ccf78d2f7;hpb=47d563ed1d34f6945804c7ce7a7bfc60c9c2ca75;ds=sidebyside

diff --git a/all b/all
index 2ff0c189..cdfcd0b5 100755
--- a/all
+++ b/all
@@ -826,11 +826,25 @@ case "$cmd" in
 		makeflags=$4
 		srcdir=$5
 		targetfiles=$6
-		rsync --delete -zvaSHPAX "$srcdir"/ "$host:$buildpath/"
-		ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
-        for f in $targetfiles; do
-			rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}"
-		done
+		case " $HOSTS_THAT_ARE_MYSELF " in
+			*\ $host\ *)
+				rsync --delete -zvaSHPAX "$srcdir"/ "$buildpath/"
+				(
+					cd $buildpath
+					eval make clean $maketargets $makeflags
+				)
+				for f in $targetfiles; do
+					mv "$buildpath/${f%:*}" "${f##*:}"
+				done
+				;;
+			*)
+				rsync --delete -zvaSHPAX "$srcdir"/ "$host:$buildpath/"
+				ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
+				for f in $targetfiles; do
+					rsync -zvaSHPAX "$host:$buildpath/${f%:*}" "${f##*:}"
+				done
+				;;
+		esac
 		;;
 	release-compile)
 		suffix=$1
@@ -840,7 +854,7 @@ case "$cmd" in
 		darkplaces_maketargets=$5
 		darkplaces_files=$6
 		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/fteqcc.build."$suffix" "$fteqcc_maketargets" "$makeflags" "fteqcc" "$fteqcc_files"
-		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "fteqcc" "$darkplaces_files"
+		"$SELF" release-compile-run "xonotic-build-$suffix" /tmp/Darkplaces.build."$suffix" "$darkplaces_maketargets" "$makeflags" "darkplaces" "$darkplaces_files"
 		;;
 	release-engine-win32)
 		"$SELF" release-compile win32 \
@@ -849,7 +863,7 @@ case "$cmd" in
 			debug 'darkplaces.exe:xonotic.exe darkplaces-sdl.exe:xonotic-sdl.exe darkplaces-dedicated.exe:xonotic-dedicated.exe'
 		;;
 	release-engine-win64)
-		"$SELF" release-compile win32 \
+		"$SELF" release-compile win64 \
 			'"DP_MAKE_TARGET=mingw CC="amd64-mingw32msvc-gcc -Wl,--dynamicbase -Wl,--nxcompat -g -DSUPPORTDIRECTX -DUSE_WSPIAPI_H -I$HOME/dp.win64/include -L$HOME/dp.win64/lib" WINDRES="amd64-mingw32msvc-windres" SDL_CONFIG="$HOME/dp.win64/bin/sdl-config" LDFLAGS_WINCOMMON=""' \
 			win 'fteqcc.exe:Xonotic/fteqcc/fteqcc-64.exe' \
 			debug 'darkplaces.exe:xonotic-64.exe darkplaces-sdl.exe:xonotic-sdl-64.exe darkplaces-dedicated.exe:xonotic-dedicated-64.exe'