From e8aeede10924227368bee2a5be6416e7d6633f70 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 1 Dec 2012 18:58:06 +0000 Subject: Allow use of specified mingw tools rather than those on the system path. --- builds/windows-32 | 8 ++++++-- builds/windows-64 | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/builds/windows-32 b/builds/windows-32 index 7362609ab..2a4d60aa1 100755 --- a/builds/windows-32 +++ b/builds/windows-32 @@ -2,14 +2,18 @@ export MINGW_CXX="i686-w64-mingw32-g++" export MINGW_WINDRES="i686-w64-mingw32-windres" -export MINGW_PREFIX="/usr/i686-w64-mingw32" +export MINGW_PREFIX="/home/carl/mingw/i686-w64-mingw32" +export MINGW_PATH="/home/carl/mingw/bin" export WINDOWS_PREFIX="/home/carl/Environments/windows/32" export PKG_CONFIG_LIBDIR=$WINDOWS_PREFIX/lib/pkgconfig ./waf clean -export PATH=$WINDOWS_PREFIX/bin:$PATH +export PATH=$WINDOWS_PREFIX/bin:$MINGW_PATH:$PATH + +echo -n "USING COMPILER " +which i686-w64-mingw32-g++ CXX=$MINGW_CXX WINRC=$MINGW_WINDRES \ CXXFLAGS="-I$WINDOWS_PREFIX/include -I$MINGW_PREFIX/include" \ diff --git a/builds/windows-64 b/builds/windows-64 index 86aad1b4b..b87c5ca4f 100755 --- a/builds/windows-64 +++ b/builds/windows-64 @@ -2,14 +2,18 @@ export MINGW_CXX="x86_64-w64-mingw32-g++" export MINGW_WINDRES="x86_64-w64-mingw32-windres" -export MINGW_PREFIX="/usr/x86_64-w64-mingw32" +export MINGW_PREFIX="/home/carl/mingw/x86_64-w64-mingw32" +export MINGW_PATH="/home/carl/mingw/bin" export WINDOWS_PREFIX="/home/carl/Environments/windows/64" export PKG_CONFIG_LIBDIR=$WINDOWS_PREFIX/lib/pkgconfig ./waf clean -export PATH=$WINDOWS_PREFIX/bin:$PATH +export PATH=$WINDOWS_PREFIX/bin:$MINGW_PATH:$PATH + +echo -n "USING COMPILER " +which x86_64-w64-mingw32-g++ CXX=$MINGW_CXX WINRC=$MINGW_WINDRES \ CXXFLAGS="-I$WINDOWS_PREFIX/include -I$MINGW_PREFIX/include" \ -- cgit v1.2.3