From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 13 Oct 2010 19:40:52 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=22579d1d9f19436956f7a546237bc6dc79296c62;p=xonotic%2Fxonotic.git

Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
---

22579d1d9f19436956f7a546237bc6dc79296c62
diff --cc all
index 38c19007,fea01c2c..4a39eed5
--- a/all
+++ b/all
@@@ -1247,7 -1233,7 +1249,7 @@@ case "$cmd" i
  		;;
  	release-engine-linux32)
  		verbose "$SELF" release-compile linux32 \
- 			'STRIP=: CC="gcc -m32 -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 -mtune=generic -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 -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' \
  			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'
  		;;