diff options
| -rwxr-xr-x | cross-make-mingw.sh | 27 | ||||
| -rwxr-xr-x | cross-make-mingw64.sh | 27 |
2 files changed, 42 insertions, 12 deletions
diff --git a/cross-make-mingw.sh b/cross-make-mingw.sh index 4707c772..e4b1b13e 100755 --- a/cross-make-mingw.sh +++ b/cross-make-mingw.sh @@ -1,13 +1,28 @@ #!/bin/sh -if [ !$CC ] -then - export CC=i586-mingw32msvc-gcc +CMD_PREFIX="i586-mingw32msvc i686-w64-mingw32"; + +if [ "X$CC" = "X" ]; then + for check in $CMD_PREFIX; do + full_check="${check}-gcc" + if [ ! $(which "$full_check") = "" ]; then + export CC="$full_check" + fi + done +fi + +if [ "X$WINDRES" = "X" ]; then + for check in $CMD_PREFIX; do + full_check="${check}-windres" + if [ ! $(which "$full_check") = "" ]; then + export WINDRES="$full_check" + fi + done fi -if [ !$WINDRES ] -then - export WINDRES=i586-mingw32msvc-windres +if [ "X$WINDRES" = "X" -o "X$CC" = "X" ]; then + echo "Error: Must define or find WINDRES and CC" + exit 1 fi export PLATFORM=mingw32 diff --git a/cross-make-mingw64.sh b/cross-make-mingw64.sh index 97f68943..d480c266 100755 --- a/cross-make-mingw64.sh +++ b/cross-make-mingw64.sh @@ -1,13 +1,28 @@ #!/bin/sh -if [ !$CC ] -then - export CC=amd64-mingw32msvc-gcc +CMD_PREFIX="amd64-mingw32msvc x86_64-w64-mingw32"; + +if [ "X$CC" = "X" ]; then + for check in $CMD_PREFIX; do + full_check="${check}-gcc" + if [ ! $(which "$full_check") = "" ]; then + export CC="$full_check" + fi + done +fi + +if [ "X$WINDRES" = "X" ]; then + for check in $CMD_PREFIX; do + full_check="${check}-windres" + if [ ! $(which "$full_check") = "" ]; then + export WINDRES="$full_check" + fi + done fi -if [ !$WINDRES ] -then - export WINDRES=amd64-mingw32msvc-windres +if [ "X$WINDRES" = "X" -o "X$CC" = "X" ]; then + echo "Error: Must define or find WINDRES and CC" + exit 1 fi export PLATFORM=mingw32 |