Hopefully fix thinko.

[dcpomatic.git] / builds / windows-32

diff --git a/builds/windows-32 b/builds/windows-32
index 036ccc685cfe211f674e6a4635a6ec9ffedb649c..d2a5f43cd8cdbca512b3d0ebc86c208119d86198 100755 (executable)
--- a/builds/windows-32
+++ b/builds/windows-32
@@ -2,19 +2,23 @@
 
 export MINGW_CXX="i686-w64-mingw32-g++"
 export MINGW_WINDRES="i686-w64-mingw32-windres"
-export MINGW_PREFIX="/usr/i686-w64-mingw32"
-export WINDOWS_PREFIX="/home/carl/Environments/windows"
+export MINGW_PREFIX="/mingw/i686-w64-mingw32"
+export MINGW_PATH="/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" \
   LINKFLAGS="-L$WINDOWS_PREFIX/lib -L$MINGW_PREFIX/lib" \
-  ./waf configure --target-windows
+  ./waf configure --target-windows $*
 if [ "$?" != "0" ]; then
   exit 1
 fi