Tweaks for 64-bit Windows build.

diff --git a/builds/windows b/builds/windows
deleted file mode 100755 (executable)
index 686641a..0000000
--- a/builds/windows
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/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/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`
-
-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

diff --git a/builds/windows-32 b/builds/windows-32
new file mode 100755 (executable)
index 0000000..cddeeee
--- /dev/null
+++ b/builds/windows-32
@@ -0,0 +1,36 @@
+#!/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/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`
+
+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
+sed -i "s~%bits%~32~g" build/windows/installer2.nsi
+
+makensis build/windows/installer2.nsi

diff --git a/builds/windows-64 b/builds/windows-64
new file mode 100755 (executable)
index 0000000..065585c
--- /dev/null
+++ b/builds/windows-64
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+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 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`
+
+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
+sed -i "s~%bits%~64~g" build/windows/installer2.nsi
+
+makensis build/windows/installer2.nsi

diff --git a/builds/windows-debug b/builds/windows-debug
new file mode 100755 (executable)
index 0000000..ca0063e
--- /dev/null
+++ b/builds/windows-debug
@@ -0,0 +1,36 @@
+#!/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/Environments/windows"
+
+export PKG_CONFIG_LIBDIR=$WINDOWS_PREFIX/lib/pkgconfig
+
+# XXX
+# ./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 --enable-debug
+if [ "$?" != "0" ]; then
+  exit 1
+fi
+
+./waf
+if [ "$?" != "0" ]; then
+  exit 1
+fi
+
+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

diff --git a/windows/installer.nsi.in b/windows/installer.nsi.in
index f2833c8ed4caa626a3104acafdaea1a8b6c2c8f2..6bb53446449ac20f570b9690b3c1615b9387b122 100644 (file)
--- a/windows/installer.nsi.in
+++ b/windows/installer.nsi.in
@@ -3,7 +3,7 @@ Name "DVD-o-matic"
 
 RequestExecutionLevel admin
 
-outFile "DVD-o-matic @version@ Installer.exe"
+outFile "DVD-o-matic @version@ @bits@-bit Installer.exe"
 !define MUI_ICON "%resources%/dvdomatic.ico"
 !define MUI_UNICON "%resources%/dvdomatic.ico"
 !define MUI_SPECIALBITMAP "%resources%/dvdomatic.bmp"