X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=all;h=35f09f9d2e3aa1aa8c73d727c2503a953511b3c9;hp=9af8ea859741bffffc93119192d3051d374bdb93;hb=d9f43c2175c35999a30c7f0838f216328da0525b;hpb=60d535818509aa7248056d99c89cb62913b0e948

diff --git a/all b/all
index 9af8ea85..35f09f9d 100755
--- a/all
+++ b/all
@@ -110,17 +110,17 @@ enter()
 }
 
 repos_urls="
-.                             |                                                   | master      |
-data/xonotic-data.pk3dir      |                                                   | master      |
-data/xonotic-music.pk3dir     |                                                   | master      |
-data/xonotic-nexcompat.pk3dir |                                                   | master      | no
-darkplaces                    |                                                   | div0-stable | svn
-netradiant                    |                                                   | master      |
-div0-gittools                 |                                                   | master      | no
-d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
-data/xonotic-maps.pk3dir      |                                                   | master      |
-mediasource                   |                                                   | master      | no
-fteqcc                        | http://github.com/Blub/qclib.git                  | master      |
+.                             |                                                   | master         |
+data/xonotic-data.pk3dir      |                                                   | master         |
+data/xonotic-music.pk3dir     |                                                   | master         |
+data/xonotic-nexcompat.pk3dir |                                                   | master         | no
+darkplaces                    |                                                   | div0-stable    | svn
+netradiant                    |                                                   | master         |
+div0-gittools                 |                                                   | master         | no
+d0_blind_id                   |                                                   | master         |
+data/xonotic-maps.pk3dir      |                                                   | master         |
+mediasource                   |                                                   | master         | no
+fteqcc                        |                                                   | xonotic-stable | noautocrlf
 "
 # todo: in darkplaces, change repobranch to div0-stable
 
@@ -308,7 +308,14 @@ fix_git_config()
 		verbose git config --unset remote.origin.pushurl || true
 	fi
 	verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-	verbose git config core.autocrlf input
+	case ",`repoflags "$d"`," in
+		*,noautocrlf,*)
+			verbose git config --unset core.autocrlf || true
+			;;
+		*)
+			verbose git config core.autocrlf input
+			;;
+	esac
 	if [ -z "`git config push.default || true`" ]; then
 		verbose git config push.default current # or is tracking better?
 	fi
@@ -704,6 +711,7 @@ case "$cmd" in
 		cleanqc=false
 		compiled0=false
 		debug=debug
+		snowleopardhack=false
 		if [ -z "$CC" ]; then
 			export CC="gcc -DSUPPORTIPV6"
 		fi
@@ -711,6 +719,7 @@ case "$cmd" in
 			case "$1" in
 				-0)
 					compiled0=true
+					shift
 					;;
 				-c)
 					cleand0=true
@@ -738,6 +747,7 @@ case "$cmd" in
 					;;
 				*)
 					# AGL cannot be compiled on systems with a kernel > 10.x (Snow Leopard)
+					snowleopardhack=true
 					TARGETS="sv-$debug sdl-$debug"
 					;;
 			esac
@@ -759,7 +769,13 @@ case "$cmd" in
 					sdl)
 						TARGETS="$TARGETS sdl-debug"
 						;;
-					glx|agl|wgl)
+					agl)
+						TARGETS="$TARGETS cl-debug"
+						if $snowleopardhack; then
+							export CC="$CC -arch i386"
+						fi
+						;;
+					glx|wgl)
 						TARGETS="$TARGETS cl-debug"
 						;;
 					dedicated)
@@ -1396,9 +1412,9 @@ case "$cmd" in
 			# 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
-				case "$f" in
+				case "${f##*:}" in
 					xonotic*.exe)
-						verbose "$d0/misc/tools/change-icon-of-exe.sh" "$d0/misc/logos/icons_ico/xonotic.ico" "$f"
+						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"
@@ -1407,7 +1423,7 @@ case "$cmd" in
 							cat darkplaces.zip
 							cd "$d0"
 							rm -rf "$d"
-						) >> "$f"
+						) >> "${f##*:}"
 						;;
 				esac
 			done
@@ -1518,7 +1534,7 @@ case "$cmd" in
 		# music: reduce bitrate
 		verbose export do_jpeg=true
 		verbose export jpeg_qual_rgb=80
-		verbose export jpeg_qual_a=95
+		verbose export jpeg_qual_a=99
 		verbose export do_dds=false
 		verbose export do_ogg=true
 		verbose export ogg_qual=1
@@ -1533,7 +1549,7 @@ case "$cmd" in
 		verbose export do_jpeg=false
 		verbose export do_jpeg_if_not_dds=true
 		verbose export jpeg_qual_rgb=80
-		verbose export jpeg_qual_a=95
+		verbose export jpeg_qual_a=99
 		verbose export do_dds=true
 		verbose export dds_flags=
 		verbose export do_ogg=true