fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Ozkan Sezer 2015-03-02 22:01:12 +00:00
parent b737b8a29f
commit 00846e545d
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Quake/build_cross_win32-sdl2.sh
View File

@ -10,7 +10,6 @@ export PATH
MAKE_CMD=make MAKE_CMD=make
SDL_CONFIG=/opt/sdl2-w32/bin/sdl2-config
CC="$TARGET-gcc" CC="$TARGET-gcc"
AS="$TARGET-as" AS="$TARGET-as"
RANLIB="$TARGET-ranlib" RANLIB="$TARGET-ranlib"
@ -19,4 +18,4 @@ WINDRES="$TARGET-windres"
STRIP="$TARGET-strip" STRIP="$TARGET-strip"
export PATH CC AS AR RANLIB WINDRES 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 $*

4
Quake/build_cross_win32.sh
View File

@ -2,7 +2,6 @@
# Change this script to meet your needs and/or environment. # Change this script to meet your needs and/or environment.
#TARGET=i386-mingw32msvc
#TARGET=i686-w64-mingw32 #TARGET=i686-w64-mingw32
TARGET=i686-pc-mingw32 TARGET=i686-pc-mingw32
#PREFIX=/opt/cross_win32 #PREFIX=/opt/cross_win32
@ -13,7 +12,6 @@ export PATH
MAKE_CMD=make MAKE_CMD=make
SDL_CONFIG=/usr/local/sdl_w32/bin/sdl-config
CC="$TARGET-gcc" CC="$TARGET-gcc"
AS="$TARGET-as" AS="$TARGET-as"
RANLIB="$TARGET-ranlib" RANLIB="$TARGET-ranlib"
@ -22,4 +20,4 @@ WINDRES="$TARGET-windres"
STRIP="$TARGET-strip" STRIP="$TARGET-strip"
export PATH CC AS AR RANLIB WINDRES 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 $*

3
Quake/build_cross_win64-sdl2.sh
View File

@ -10,7 +10,6 @@ export PATH
MAKE_CMD=make MAKE_CMD=make
SDL_CONFIG=/opt/sdl2-w64/bin/sdl2-config
CC="$TARGET-gcc" CC="$TARGET-gcc"
AS="$TARGET-as" AS="$TARGET-as"
RANLIB="$TARGET-ranlib" RANLIB="$TARGET-ranlib"
@ -19,4 +18,4 @@ WINDRES="$TARGET-windres"
STRIP="$TARGET-strip" STRIP="$TARGET-strip"
export PATH CC AS AR RANLIB WINDRES 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 $*

4
Quake/build_cross_win64.sh
View File

@ -2,7 +2,6 @@
# Change this script to meet your needs and/or environment. # Change this script to meet your needs and/or environment.
#TARGET=x86_64-pc-mingw32
TARGET=x86_64-w64-mingw32 TARGET=x86_64-w64-mingw32
PREFIX=/opt/cross_win64 PREFIX=/opt/cross_win64
@ -11,7 +10,6 @@ export PATH
MAKE_CMD=make MAKE_CMD=make
SDL_CONFIG=/opt/sdl_w64/bin/sdl-config
CC="$TARGET-gcc" CC="$TARGET-gcc"
AS="$TARGET-as" AS="$TARGET-as"
RANLIB="$TARGET-ranlib" RANLIB="$TARGET-ranlib"
@ -20,4 +18,4 @@ WINDRES="$TARGET-windres"
STRIP="$TARGET-strip" STRIP="$TARGET-strip"
export PATH CC AS AR RANLIB WINDRES 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 $*

1
Windows/SDL/bin/sdl-config
View File

@ -55,3 +55,4 @@ while test $# -gt 0; do
esac esac
shift shift
done done

1
Windows/SDL2/bin/sdl2-config
View File

@ -55,3 +55,4 @@ while test $# -gt 0; do
esac esac
shift shift
done done