Allow use of specified mingw tools rather than those on the system path.

diff --git a/builds/windows-32 b/builds/windows-32
index 7362609ab6e657fd09902157482158cd5ebd2e1f..2a4d60aa1575402af5f8736bcb96a68f2296ca1d 100755 (executable)
--- 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 86aad1b4b20b5beb747116384175fe3fd6f2b603..b87c5ca4f10e8ece85784121d6852acdf85e7a12 100755 (executable)
--- 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" \