RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-01-19 12:40:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to detect when X64 Windows is being used

Browse Source
This commit is contained in:
Mario 2018-10-01 19:48:17 +10:00
parent 4370079531
commit 916a92dcc9
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
misc/tools/all/xonotic.subr
View File

@ -139,7 +139,14 @@ case "$cmd" in
if [ -n "$WE_HATE_OUR_USERS" ]; then if [ -n "$WE_HATE_OUR_USERS" ]; then
# win32: use SDL2 # win32: use SDL2
MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win32/sdl/bin/sdl2-config" case `uname -m` in
x86_64)
MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win64/sdl/bin/sdl2-config"
;;
*)
MAKEFLAGS="$MAKEFLAGS SDL_CONFIG=$d0/misc/builddeps/win32/sdl/bin/sdl2-config"
;;
esac
# win32: don't rely on jpeg includes # win32: don't rely on jpeg includes
MAKEFLAGS="$MAKEFLAGS LIB_JPEG= CFLAGS_LIBJPEG=" MAKEFLAGS="$MAKEFLAGS LIB_JPEG= CFLAGS_LIBJPEG="
@ -195,10 +202,20 @@ case "$cmd" in
# use binaries then, if we can... # use binaries then, if we can...
mkdir -p .libs mkdir -p .libs
if [ -n "$WE_HATE_OUR_USERS" ]; then if [ -n "$WE_HATE_OUR_USERS" ]; then
verbose cp "$d0/misc/buildfiles/win32/libd0_blind_id"-* .libs/ case `uname -m` in
verbose cp "$d0/misc/buildfiles/win32/libd0_rijndael"-* .libs/ x86_64)
verbose cp "$d0/misc/buildfiles/win32/libgmp"-* .libs/ verbose cp "$d0/misc/buildfiles/win64/libd0_blind_id"-* .libs/
compiled0=false verbose cp "$d0/misc/buildfiles/win64/libd0_rijndael"-* .libs/
verbose cp "$d0/misc/buildfiles/win64/libgmp"-* .libs/
compiled0=false
;;
*)
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/
compiled0=false
;;
esac
else else
case "`uname`" in case "`uname`" in
Linux) Linux)
@ -284,7 +301,14 @@ case "$cmd" in
run) run)
if [ -n "$WE_HATE_OUR_USERS" ]; then if [ -n "$WE_HATE_OUR_USERS" ]; then
client= client=
export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH" case `uname -m` in
x86_64)
export PATH="$d0/misc/buildfiles/win64:$d0/d0_blind_id/.libs:$PATH"
;;
*)
export PATH="$d0/misc/buildfiles/win32:$d0/d0_blind_id/.libs:$PATH"
;;
esac
elif [ x"`uname`" = x"Darwin" ]; then 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_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" export DYLD_FRAMEWORK_PATH="$d0/misc/buildfiles/osx/Xonotic.app/Contents/Frameworks"