Merge branch 'master' into Mario/melano_osx_winfix

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index e1462c8bf9a4091a10f3ef008344c493e455c6b5..d9555ff4f6be35a75f0cfe760446951b9af63aa0 100644 (file)
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -83,7 +83,7 @@ case "$cmd" in
                        TARGETS="sv-$debug sdl-$debug"
                        export CC="$CC -fno-reorder-blocks"
                else
-                       TARGETS="sv-$debug cl-$debug sdl-$debug"
+                       TARGETS="sv-$debug cl-$debug sdl2-$debug"
                fi
 
                if [ $# -gt 0 ] && [ x"$1" = x"" ]; then
@@ -131,7 +131,7 @@ case "$cmd" in
 
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        # win32: use SDL2
-                       MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win32/sdl/bin/sdl2-config"
+                       MAKEFLAGS="$MAKEFLAGS \"SDL2_CONFIG=$d0/misc/builddeps/win64/sdl/bin/sdl2-config\""
 
                        # win32: don't rely on jpeg includes
                        MAKEFLAGS="$MAKEFLAGS LIB_JPEG= CFLAGS_LIBJPEG="
@@ -140,7 +140,7 @@ case "$cmd" in
                if [ x"`uname`" = x"Darwin" ]; then
                        # osx: use SDL2
                        f=$d0/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks
-                       MAKEFLAGS="$MAKEFLAGS SDLCONFIG_MACOSXCFLAGS=-I$f/SDL2.framework/Headers SDLCONFIG_MACOSXLIBS=-F$f SDLCONFIG_MACOSXLIBS+=-framework SDLCONFIG_MACOSXLIBS+=SDL2 SDLCONFIG_MACOSXLIBS+=-framework SDLCONFIG_MACOSXLIBS+=Cocoa SDLCONFIG_MACOSXLIBS+=-I$f/SDL2.framework/Headers SDLCONFIG_MACOSXSTATICLIBS=-F$f SDLCONFIG_MACOSXSTATICLIBS+=-framework SDLCONFIG_MACOSXSTATICLIBS+=SDL2 SDLCONFIG_MACOSXSTATICLIBS+=-framework SDLCONFIG_MACOSXSTATICLIBS+=Cocoa SDLCONFIG_MACOSXSTATICLIBS+=-I$f/SDL2.framework/Headers"
+                       MAKEFLAGS="$MAKEFLAGS \"SDLCONFIG_MACOSXCFLAGS=-I$f/SDL2.framework/Headers\" \"SDLCONFIG_MACOSXLIBS=-F$f\" SDLCONFIG_MACOSXLIBS+=-framework SDLCONFIG_MACOSXLIBS+=SDL2 SDLCONFIG_MACOSXLIBS+=-framework SDLCONFIG_MACOSXLIBS+=Cocoa \"SDLCONFIG_MACOSXLIBS+=-I$f/SDL2.framework/Headers\" \"SDLCONFIG_MACOSXSTATICLIBS=-F$f\" SDLCONFIG_MACOSXSTATICLIBS+=-framework SDLCONFIG_MACOSXSTATICLIBS+=SDL2 SDLCONFIG_MACOSXSTATICLIBS+=-framework SDLCONFIG_MACOSXSTATICLIBS+=Cocoa \"SDLCONFIG_MACOSXSTATICLIBS+=-I$f/SDL2.framework/Headers\""
                fi
 
                # workaround ARM issue in DP's makefile.inc
@@ -184,9 +184,9 @@ case "$cmd" in
                        # use binaries then, if we can...
                        mkdir -p .libs
                        if [ -n "$WE_HATE_OUR_USERS" ]; then
-                               verbose cp "$d0/misc/buildfiles/win32/libd0_blind_id"-* .libs/
-                               verbose cp "$d0/misc/buildfiles/win32/libd0_rijndael"-* .libs/
-                               verbose cp "$d0/misc/buildfiles/win32/libgmp"-* .libs/
+                               verbose cp "$d0/misc/buildfiles/win64/libd0_blind_id"-* .libs/
+                               verbose cp "$d0/misc/buildfiles/win64/libd0_rijndael"-* .libs/
+                               verbose cp "$d0/misc/buildfiles/win64/libgmp"-* .libs/
                        else
                                case "`uname`" in
                                        Linux)
@@ -280,7 +280,7 @@ case "$cmd" in
        run)
                if [ -n "$WE_HATE_OUR_USERS" ]; then
                        client=
-                       export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
+                       export PATH="$d0/misc/buildfiles/win64:$d0/d0_blind_id/.libs:$PATH"
                elif [ x"`uname`" = x"Darwin" ]; then
                        export DYLD_LIBRARY_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS:$d0/d0_blind_id/.libs"
                        export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"