Fix merge.
[dcpomatic.git] / rebuild-windows
index 3424d7451834118af9b64df466c23b70ec323425..686641a74af4d6d1e3c2dd8af45909379326991b 100755 (executable)
@@ -3,17 +3,26 @@
 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/src/windows"
+export WINDOWS_PREFIX="/home/carl/Environments/windows"
 
 export PKG_CONFIG_LIBDIR=$WINDOWS_PREFIX/lib/pkgconfig
 
 ./waf clean
+
 export PATH=$WINDOWS_PREFIX/bin:$PATH
+
 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
+if [ "$?" != "0" ]; then
+  exit 1
+fi
+
 ./waf
+if [ "$?" != "0" ]; then
+  exit 1
+fi
 
 d=`pwd`