From 5328c323f4a38e50ca19636eb62457805ecd0cff Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Thu, 16 Jun 2011 22:50:33 +0000 Subject: Fixes for bugs introduced in last several revisions --- cross-make-mingw.sh | 16 +++++++++++----- 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 $* -- cgit