Merge branch 'master' into divVerent/crypto2

[xonotic/xonotic.git] / all

diff --git a/all b/all
index 2906d8a..e1c7780 100755 (executable)
--- a/all
+++ b/all
@@ -119,6 +119,7 @@ darkplaces                    |
 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
 div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
 netradiant                    |                                                   | master      |
 fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
 div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
 netradiant                    |                                                   | master      |

+d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |

 "
 # todo: in darkplaces, change repobranch to div0-stable
 
 "
 # todo: in darkplaces, change repobranch to div0-stable
 


@@ -442,18 +443,21 @@ case "$cmd" in
                fi
                case "$1" in
                        -c)
                fi
                case "$1" in
                        -c)

+                               cleand0=true

                                cleandp=true
                                cleanqcc=true
                                cleanqc=true
                                shift
                                ;;
                        -n)
                                cleandp=true
                                cleanqcc=true
                                cleanqc=true
                                shift
                                ;;
                        -n)

+                               cleand0=false

                                cleandp=false
                                cleanqcc=false
                                cleanqc=false
                                shift
                                ;;
                        *)
                                cleandp=false
                                cleanqcc=false
                                cleanqc=false
                                shift
                                ;;
                        *)

+                               cleand0=false

                                cleandp=false
                                cleanqcc=false
                                cleanqc=true # version info
                                cleandp=false
                                cleanqcc=false
                                cleanqc=true # version info


@@ -508,6 +512,16 @@ case "$cmd" in
                        fi
                fi
 
                        fi
                fi
 

+               enter "$d0/d0_blind_id" verbose
+               if ! [ -f Makefile ]; then
+                       verbose sh autogen.sh
+                       verbose ./configure
+               fi
+               if $cleand0; then
+                       verbose make $MAKEFLAGS clean
+               fi
+               verbose make $MAKEFLAGS
+

                enter "$d0/fteqcc" verbose
                if $cleanqcc; then
                        verbose make $MAKEFLAGS clean
                enter "$d0/fteqcc" verbose
                if $cleanqcc; then
                        verbose make $MAKEFLAGS clean


@@ -539,12 +553,13 @@ case "$cmd" in
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=

-                       export PATH="$d0/misc/buildfiles/win64:$d0/misc/buildfiles/win32:$PATH"
+                       export PATH="$d0/misc/buildfiles/win64:$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"

                elif [ x"`uname`" = x"Darwin" ]; then
                elif [ x"`uname`" = x"Darwin" ]; then

-                       export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS"
+                       export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/MacOS:$d0/d0_blind_id/.libs"

                        export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                        client=-sdl
                else
                        export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic-SDL.app/Contents/Frameworks"
                        client=-sdl
                else

+                       export LD_LIBRARY_PATH="$d0/d0_blind_id/.libs"

                        client=-sdl
                fi
                case "$1" in
                        client=-sdl
                fi
                case "$1" in