From: Mattia Basaglia Date: Mon, 10 Aug 2015 20:12:55 +0000 (+0200) Subject: Add some quotes in the build scripts X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2a47782ff8cf6e34c8ecf4d0effb355dbfad8ae0;p=xonotic%2Fxonotic.git Add some quotes in the build scripts --- diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr index 6f66d62e..97f68667 100644 --- a/misc/tools/all/xonotic.subr +++ b/misc/tools/all/xonotic.subr @@ -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 \"SDL_CONFIG=$d0/misc/builddeps/win32/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