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

Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
---

87a39db1a58fe7f801c51b6721515fa8e4a55251
diff --cc all
index 593e0b2e,5be81134..a4d19548
--- a/all
+++ b/all
@@@ -116,10 -116,9 +116,10 @@@ data/xonotic-nexcompat.pk3dir 
  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                        | git://github.com/Blub/qclib.git                   | master      |
+ fteqcc                        | http://github.com/Blub/qclib.git                  | master      |
  "
  # todo: in darkplaces, change repobranch to div0-stable
  
@@@ -1165,13 -1168,13 +1184,13 @@@ case "$cmd" i
  		;;
  	release-engine-linux32)
  		verbose "$SELF" release-compile linux32 \
- 			'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
 -			'STRIP=: CC="gcc -m32 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
++			'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' \
  			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'
  		;;
  	release-engine-linux64)
  		verbose "$SELF" release-compile linux64 \
- 			'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a DP_CRYPTO_STATIC_LIBDIR=.deps/lib' \
 -			'STRIP=: CC="gcc -m64 -g -I.deps/include -L.deps/lib -DSUPPORTIPV6" DP_MODPLUG_STATIC_LIBDIR=.deps/lib LIB_JPEG=.deps/lib/libjpeg.a' \
++			'STRIP=: CC="gcc -m64 -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.linux64' \
  			release 'darkplaces-glx:Xonotic/xonotic-linux64-glx darkplaces-sdl:Xonotic/xonotic-linux64-sdl darkplaces-dedicated:Xonotic/xonotic-linux64-dedicated'
  		;;