From b04477d4038c4787a39f219773716ac62ae1597d Mon Sep 17 00:00:00 2001 From: ketmar Date: Wed, 22 Feb 2012 12:59:12 +0200 Subject: [PATCH] try to use cross-mingw if we can find it with WINDOZE=1 --- defaults/Jambase.windoze | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/defaults/Jambase.windoze b/defaults/Jambase.windoze index f14be6a..c507f44 100644 --- a/defaults/Jambase.windoze +++ b/defaults/Jambase.windoze @@ -39,21 +39,26 @@ rule setup-windoze { } -rule check-setup-windoze { - if $(WINDOZE) { setup-windoze ; } -} +rule use-mingw32 { + if ([ sys-has-command i686-pc-mingw32-gcc ]) { + CC = i686-pc-mingw32-gcc -pipe -static-libgcc ; + C++ = i686-pc-mingw32-g++ -pipe -static-libgcc -static-libstdc++ ; + LINK = i686-pc-mingw32-gcc -pipe -Wl,--enable-auto-import ; + C++LINK = i686-pc-mingw32-g++ -pipe -Wl,--enable-auto-import ; + AR = i686-pc-mingw32-ar -ru ; + RANLIB = i686-pc-mingw32-ranlib ; + actions WindozeResourceCompiler { + i686-pc-mingw32-windres -i $(>) -o $(<) + } + } +} -rule use-mingw32 { - CC = i686-pc-mingw32-gcc -pipe -static-libgcc ; - C++ = i686-pc-mingw32-g++ -pipe -static-libgcc -static-libstdc++ ; - LINK = i686-pc-mingw32-gcc -pipe -Wl,--enable-auto-import ; - C++LINK = i686-pc-mingw32-g++ -pipe -Wl,--enable-auto-import ; - AR = i686-pc-mingw32-ar -ru ; - RANLIB = i686-pc-mingw32-ranlib ; - actions WindozeResourceCompiler { - i686-pc-mingw32-windres -i $(>) -o $(<) +rule check-setup-windoze { + if $(WINDOZE) { + setup-windoze ; + use-mingw32 ; } } -- 2.11.4.GIT