From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 14 Oct 2010 08:00:03 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~18
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=851b96062ead2bac361ce5aadbe46f44a7ecc5fc

Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
---

851b96062ead2bac361ce5aadbe46f44a7ecc5fc
diff --cc all
index 70309e05,e6002823..54452f88
--- a/all
+++ b/all
@@@ -1250,7 -1234,7 +1250,7 @@@ case "$cmd" i
  		;;
  	release-engine-linux32)
  		verbose "$SELF" release-compile linux32 \
- 			'STRIP=: CC="gcc -m32 -march=i686 -mtune=generic -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
 -			'STRIP=: CC="gcc -m32 -march=i686 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
++			'STRIP=: CC="gcc -m32 -march=i686 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
  			all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.linux32' \
  			release 'darkplaces-glx:Xonotic/xonotic-linux32-glx darkplaces-sdl:Xonotic/xonotic-linux32-sdl darkplaces-dedicated:Xonotic/xonotic-linux32-dedicated'
  		;;