Add rebuild-windows script.

2 files changed, 26 insertions, 6 deletions

diff --git a/build-windows b/build-windows
index 3424d7451..dda495263 100755
--- a/build-windows
+++ b/build-windows
@@ -7,12 +7,6 @@ export WINDOWS_PREFIX="/home/carl/src/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
 ./waf
 
 d=`pwd`
diff --git a/rebuild-windows b/rebuild-windows
new file mode 100755
index 000000000..3424d7451
--- /dev/null
+++ b/rebuild-windows
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+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 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
+./waf
+
+d=`pwd`
+
+cp build/windows/installer.nsi build/windows/installer2.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
+
+makensis build/windows/installer2.nsi