X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;fp=all;h=55fba078518c7ca5ac06294cd305625f0f0e9ee0;hp=bd561dde72a4ca59ef025b5719363aed50f15d00;hb=2003f97c2a6ab97a9e51922726bc37208b2e12d1;hpb=9991fcb647a9e2abf0183e117a04ed8bac5391db

diff --git a/all b/all
index bd561dde..55fba078 100755
--- a/all
+++ b/all
@@ -670,6 +670,8 @@ case "$cmd" in
 			fi
 		fi
 		set -- "darkplaces/darkplaces$client" -nexuiz -customgamename Xonotic -customgamedirname1 data -customgamedirname2 "" -customgamescreenshotname xonotic -customgameuserdirname xonotic -mygames "$@"
+		# change this to:
+		#set -- "darkplaces/darkplaces$client" -xonotic -mygames "$@"
 
 		# if pulseaudio is running: USE IT
 		if [ -z "$SDL_AUDIODRIVER" ] && ! [ -n "$WE_HATE_OUR_USERS" ] && ! [ x"`uname`" = x"Darwin" ]; then
@@ -1010,7 +1012,21 @@ case "$cmd" in
 			esac
 			# now rebrand the binaries...
 			for f in $targetfiles; do
-				verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
+				#verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
+				case "$f" in
+					xonotic*.exe)
+						verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$f"
+						(
+							d=`mktemp -d -t rebrand.XXXXXX`
+							cd "$d"
+							echo "-mygames" > darkplaces.opt
+							zip -9r darkplaces.zip darkplaces.opt
+							cat darkplaces.zip
+							cd "$d0"
+							rm -rf "$d"
+						) >> "$f"
+						;;
+				esac
 			done
 		fi
 		;;
@@ -1220,16 +1236,19 @@ case "$cmd" in
 		;;
 	release-zip)
 		stamp=`cat Xonotic/stamp.txt`
-		verbose zip -9yr Xonotic-$stamp-common.zip \
+		verbose zip -9yr Xonotic-$stamp-engine.zip \
 			Xonotic/*.dll \
+			Xonotic/bin64/*.dll \
+			Xonotic/*.app \
+			Xonotic/xonotic-* \
+			Xonotic/xonotic.exe
+		verbose cp Xonotic-$stamp-engine.zip Xonotic-$stamp-common.zip
+		verbose zip -9yr Xonotic-$stamp-common.zip \
 			Xonotic/source/*/ \
 			Xonotic/Docs \
 			Xonotic/misc \
 			Xonotic/fteqcc \
 			Xonotic/server \
-			Xonotic/*.app \
-			Xonotic/xonotic-* \
-			Xonotic/xonotic.exe \
 			Xonotic/key_0.d0pk \
 			Xonotic/data/font-nimbussansl-$stamp.pk3
 		verbose cp Xonotic-$stamp-common.zip Xonotic-$stamp.zip