diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-06-16 22:50:33 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-10 21:33:46 +0000 |
| commit | 5328c323f4a38e50ca19636eb62457805ecd0cff (patch) | |
| tree | e08411b3ff8488f02333a0ef464a9807f98896a3 | |
| parent | 4a71993ec6ef433bc44dc91c8cc776c7b402fe9f (diff) | |
Fixes for bugs introduced in last several revisions
| -rwxr-xr-x | cross-make-mingw.sh | 16 | ||||
| -rwxr-xr-x | cross-make-mingw64.sh | 16 |
2 files changed, 22 insertions, 10 deletions
diff --git a/cross-make-mingw.sh b/cross-make-mingw.sh index 604ced10..4707c772 100755 --- a/cross-make-mingw.sh +++ b/cross-make-mingw.sh @@ -1,10 +1,16 @@ #!/bin/sh -export CC=i586-mingw32msvc-gcc -export WINDRES=i586-mingw32msvc-windres -export PLATFORM=mingw32 -if [ !$ARCH ] +if [ !$CC ] then -export ARCH=x86 + export CC=i586-mingw32msvc-gcc +fi + +if [ !$WINDRES ] +then + export WINDRES=i586-mingw32msvc-windres fi + +export PLATFORM=mingw32 +export ARCH=x86 + exec make $* diff --git a/cross-make-mingw64.sh b/cross-make-mingw64.sh index 5a05a81a..5ea627ea 100755 --- a/cross-make-mingw64.sh +++ b/cross-make-mingw64.sh @@ -1,10 +1,16 @@ #!/bin/sh -export CC=amd64-mingw32msvc-gcc -export WINDRES=amd64-mingw32msvc-windres -export PLATFORM=mingw32 -if [ !$ARCH ] +if [ !$CC ] then -export ARCH=x86_64 + export CC=amd64-mingw32msvc-gcc +fi + +if [ !$WINDRES ] +then + export WINDRES=amd64-mingw32msvc-windres fi + +export PLATFORM=mingw32 +export ARCH=x86_64 + exec make $* |