From 00846e545df1e082e0d76d2a6dadd98f92e3ff18 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Mon, 2 Mar 2015 22:01:12 +0000 Subject: [PATCH] fix the cross-build scripts after r1180. git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1181 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/build_cross_win32-sdl2.sh | 3 +-- Quake/build_cross_win32.sh | 4 +--- Quake/build_cross_win64-sdl2.sh | 3 +-- Quake/build_cross_win64.sh | 4 +--- Windows/SDL/bin/sdl-config | 1 + Windows/SDL2/bin/sdl2-config | 1 + 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Quake/build_cross_win32-sdl2.sh b/Quake/build_cross_win32-sdl2.sh index 7ea22cd8..bc698d8a 100755 --- a/Quake/build_cross_win32-sdl2.sh +++ b/Quake/build_cross_win32-sdl2.sh @@ -10,7 +10,6 @@ export PATH MAKE_CMD=make -SDL_CONFIG=/opt/sdl2-w32/bin/sdl2-config CC="$TARGET-gcc" AS="$TARGET-as" RANLIB="$TARGET-ranlib" @@ -19,4 +18,4 @@ WINDRES="$TARGET-windres" STRIP="$TARGET-strip" export PATH CC AS AR RANLIB WINDRES STRIP -exec $MAKE_CMD USE_SDL2=1 WINSOCK2=1 SDL_CONFIG=$SDL_CONFIG CC=$CC AS=$AS RANLIB=$RANLIB AR=$AR WINDRES=$WINDRES STRIP=$STRIP -f Makefile.w32 $* +exec $MAKE_CMD USE_SDL2=1 WINSOCK2=1 CC=$CC AS=$AS RANLIB=$RANLIB AR=$AR WINDRES=$WINDRES STRIP=$STRIP -f Makefile.w32 $* diff --git a/Quake/build_cross_win32.sh b/Quake/build_cross_win32.sh index 82880be3..59957967 100755 --- a/Quake/build_cross_win32.sh +++ b/Quake/build_cross_win32.sh @@ -2,7 +2,6 @@ # Change this script to meet your needs and/or environment. -#TARGET=i386-mingw32msvc #TARGET=i686-w64-mingw32 TARGET=i686-pc-mingw32 #PREFIX=/opt/cross_win32 @@ -13,7 +12,6 @@ export PATH MAKE_CMD=make -SDL_CONFIG=/usr/local/sdl_w32/bin/sdl-config CC="$TARGET-gcc" AS="$TARGET-as" RANLIB="$TARGET-ranlib" @@ -22,4 +20,4 @@ WINDRES="$TARGET-windres" STRIP="$TARGET-strip" export PATH CC AS AR RANLIB WINDRES STRIP -exec $MAKE_CMD SDL_CONFIG=$SDL_CONFIG CC=$CC AS=$AS RANLIB=$RANLIB AR=$AR WINDRES=$WINDRES STRIP=$STRIP -f Makefile.w32 $* +exec $MAKE_CMD CC=$CC AS=$AS RANLIB=$RANLIB AR=$AR WINDRES=$WINDRES STRIP=$STRIP -f Makefile.w32 $* diff --git a/Quake/build_cross_win64-sdl2.sh b/Quake/build_cross_win64-sdl2.sh index a40ce510..312c7bad 100755 --- a/Quake/build_cross_win64-sdl2.sh +++ b/Quake/build_cross_win64-sdl2.sh @@ -10,7 +10,6 @@ export PATH MAKE_CMD=make -SDL_CONFIG=/opt/sdl2-w64/bin/sdl2-config CC="$TARGET-gcc" AS="$TARGET-as" RANLIB="$TARGET-ranlib" @@ -19,4 +18,4 @@ WINDRES="$TARGET-windres" STRIP="$TARGET-strip" export PATH CC AS AR RANLIB WINDRES STRIP -exec $MAKE_CMD USE_SDL2=1 SDL_CONFIG=$SDL_CONFIG CC=$CC AS=$AS RANLIB=$RANLIB AR=$AR WINDRES=$WINDRES STRIP=$STRIP -f Makefile.w64 $* +exec $MAKE_CMD USE_SDL2=1 CC=$CC AS=$AS RANLIB=$RANLIB AR=$AR WINDRES=$WINDRES STRIP=$STRIP -f Makefile.w64 $* diff --git a/Quake/build_cross_win64.sh b/Quake/build_cross_win64.sh index 8d1ccbdf..877077ab 100755 --- a/Quake/build_cross_win64.sh +++ b/Quake/build_cross_win64.sh @@ -2,7 +2,6 @@ # Change this script to meet your needs and/or environment. -#TARGET=x86_64-pc-mingw32 TARGET=x86_64-w64-mingw32 PREFIX=/opt/cross_win64 @@ -11,7 +10,6 @@ export PATH MAKE_CMD=make -SDL_CONFIG=/opt/sdl_w64/bin/sdl-config CC="$TARGET-gcc" AS="$TARGET-as" RANLIB="$TARGET-ranlib" @@ -20,4 +18,4 @@ WINDRES="$TARGET-windres" STRIP="$TARGET-strip" export PATH CC AS AR RANLIB WINDRES STRIP -exec $MAKE_CMD SDL_CONFIG=$SDL_CONFIG CC=$CC AS=$AS RANLIB=$RANLIB AR=$AR WINDRES=$WINDRES STRIP=$STRIP -f Makefile.w64 $* +exec $MAKE_CMD CC=$CC AS=$AS RANLIB=$RANLIB AR=$AR WINDRES=$WINDRES STRIP=$STRIP -f Makefile.w64 $* diff --git a/Windows/SDL/bin/sdl-config b/Windows/SDL/bin/sdl-config index ca44cebf..292fd557 100755 --- a/Windows/SDL/bin/sdl-config +++ b/Windows/SDL/bin/sdl-config @@ -55,3 +55,4 @@ while test $# -gt 0; do esac shift done + diff --git a/Windows/SDL2/bin/sdl2-config b/Windows/SDL2/bin/sdl2-config index d2e81717..9430d6b8 100755 --- a/Windows/SDL2/bin/sdl2-config +++ b/Windows/SDL2/bin/sdl2-config @@ -55,3 +55,4 @@ while test $# -gt 0; do esac shift done +