Merge branch 'new-env-test'

[dcpomatic.git] / builds / windows-64

diff --git a/builds/windows-64 b/builds/windows-64
index f203370a11a91c9f817ff0b48e4d279a033a05c6..b87c5ca4f10e8ece85784121d6852acdf85e7a12 100755 (executable)
--- a/builds/windows-64
+++ b/builds/windows-64
@@ -2,20 +2,24 @@
 
 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 WINDOWS_PREFIX="/home/carl/Environments/windows-64"
+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" \
   LINKFLAGS="-L$WINDOWS_PREFIX/lib -L$MINGW_PREFIX/lib" \
   PATH=$WINDOWS_PREFIX/bin:$PATH \
-  ./waf configure --target-windows
+  ./waf configure --target-windows $*
 if [ "$?" != "0" ]; then
   exit 1
 fi
@@ -27,11 +31,11 @@ fi
 
 d=`pwd`
 
-cp build/windows/installer.nsi build/windows/installer2.nsi
+cp build/windows/installer.64.nsi build/windows/installer2.64.nsi
 
-sed -i "s~%resources%~$d/windows~g" build/windows/installer2.nsi
-sed -i "s~%deps%~$WINDOWS_PREFIX~g" build/windows/installer2.nsi
-sed -i "s~%binaries%~$d/build~g" build/windows/installer2.nsi
-sed -i "s~%bits%~64~g" build/windows/installer2.nsi
+sed -i "s~%resources%~$d/windows~g" build/windows/installer2.64.nsi
+sed -i "s~%deps%~$WINDOWS_PREFIX~g" build/windows/installer2.64.nsi
+sed -i "s~%binaries%~$d/build~g" build/windows/installer2.64.nsi
+sed -i "s~%bits%~64~g" build/windows/installer2.64.nsi
 
-makensis build/windows/installer2.nsi
+makensis build/windows/installer2.64.nsi