X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Frelease.subr;fp=misc%2Ftools%2Fall%2Frelease.subr;h=93c2586557e6df667f3119bf65ba081ea05ebaab;hp=f3202c2caf21f2ef9f0a4be5babfde6404dbc6bd;hb=4223dcb8633421a4b5a94c8ebda31e629b4bd7eb;hpb=8ee3f49e54ac746a61081301d3c5e7d73b583031

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index f3202c2c..93c25865 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -2,6 +2,13 @@ release_common()
 {
 	export LC_ALL=C
 
+	if [ -z "$MAKEFLAGS" ]; then
+		ncpus=`getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1`
+		if [ $ncpus -gt 1 ]; then
+			export MAKEFLAGS=-j$ncpus
+		fi
+	fi
+
 	release_args="$cmd $*"
 	msg "*** $release_args: start"
 	release_starttime=`date +%s`
@@ -173,9 +180,12 @@ case "$cmd" in
 			verbose cd Xonotic
 			verbose mkdir data source source/darkplaces source/gmqcc source/d0_blind_id mapping
 			verbose rm -rf misc/builddeps
-			verbose mv misc/buildfiles/win32 bin32 || true
-			verbose mv bin32/SDL.dll . || true
-			verbose mv misc/buildfiles/win64 bin64 || true
+			#verbose mv bin32/SDL.dll . || true # Leftover?
+
+			# We're going to be building these later
+			#verbose mv misc/buildfiles/win32 bin32 || true
+			#verbose mv misc/buildfiles/win64 bin64 || true
+
 			verbose mv misc/buildfiles/osx/* . || true
 			verbose rm -rf misc/buildfiles
 			verbose rm -rf misc/pki
@@ -265,6 +275,32 @@ case "$cmd" in
 				;;
 		esac
 		;;
+	release-dlls-compile)
+		release_common
+		arch=$1
+		buildpath=$2
+		targetdir=$3
+		mkdir -p "$targetdir"
+		(
+			cd "misc/buildsrc"
+			verbose ./dlls.sh all "$buildpath" "$arch"
+		)
+		verbose cp -v $buildpath/out/$arch/* "$targetdir"
+		;;
+	release-dlls-win32)
+		release_common
+		verbose "$SELF" release-dlls-compile win32 /tmp/dlls Xonotic/bin32
+		;;
+	release-dlls-win64)
+		release_common
+		verbose "$SELF" release-dlls-compile win64 /tmp/dlls Xonotic/bin64
+		;;
+	release-dlls)
+		release_common
+		verbose "$SELF" release-dlls-win32
+		verbose "$SELF" release-dlls-win64
+		verbose rm -rf /tmp/dlls
+		;;
 	release-engine-win32)
 		release_common
 		#good=true
@@ -574,6 +610,7 @@ case "$cmd" in
 		release_common
 		verbose "$SELF" release-prepare
 		verbose "$SELF" release-maps
+		verbose "$SELF" release-dlls
 		verbose "$SELF" release-engine
 		verbose "$SELF" release-qc
 		verbose "$SELF" release-pack