From c53c85883ff356bd0706fcc85cff940ccb1b90c8 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 25 Mar 2016 02:54:32 +1000 Subject: [PATCH] Make Xonotic build on X64 MSYS2 (temporary hack method) --- misc/tools/all/xonotic.subr | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr index 97f68667..ef6f043d 100644 --- 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=" @@ -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) @@ -275,7 +275,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" -- 2.39.2