Update version to 4.2.1

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

packaging/windows/mingw-make.sh

@@ -29,10 +29,11 @@ if [[ $1 == "Qt5-64" ]] ; then
 		QMAKE_MOC=/usr/x86_64-w64-mingw32/bin/qt5/moc \
 		QMAKE_UIC=/usr/x86_64-w64-mingw32/bin/qt5/uic \
 		QMAKE_RCC=/usr/x86_64-w64-mingw32/bin/qt5/rcc \
-		LIBDCDEVEL=../libdivecomputer \
 		LIBMARBLEDEVEL=../marble \
 		LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
 		QMAKE_LIBDIR+=../openssl \
+		CONFIG+=win64target \
+		CONFIG+=brokenQt532win \
 		$BASEDIR/../../subsurface.pro
 
 elif [[ $1 == "Qt5" ]] ; then
@@ -68,7 +69,6 @@ else
 
 	mingw32-qmake-qt4 \
 		CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \
-		LIBDCDEVEL=../libdivecomputer \
 		LIBMARBLEDEVEL=../marble \
 		LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
 		$BASEDIR/../../subsurface.pro

packaging/windows/subsurface.nsi.in

@@ -83,6 +83,22 @@
 #--------------------------------
 # Default installer section
 
+Function .onInit
+    !include x64.nsh
+    ${If} 64BITBUILDTOKEN
+        ${IfNot} ${RunningX64}
+            MessageBox MB_OK "You cannot install the 64bit version of Subsurface on a 32bit version of Windows"
+                Abort "Please download the 32bit version of the Subsurface installer"
+        ${EndIf}
+    ${Else}
+        ${If} ${RunningX64}
+            MessageBox MB_YESNO "Do you really want to install the 32bit version of Subsurface on your 64bit version of Windows?" IDYES goforit
+                Abort "Please download the 64bit version of the Subsurface installer"
+            goforit:
+        ${EndIf}
+    ${Endif}
+FunctionEnd
+
 Section
     SetShellVarContext all
 

scripts/win-ldd.pl

@@ -51,7 +51,7 @@ for (@ARGV) {
 	next if /^-/;
 	if (-d $_) {
 		push @searchdirs, $_;
-	} elsif (-f $_) {
+	} elsif (-f $_ && ! /\.a$/) {
 		# Add $_'s path to the search list too
 		my $dirname = $_;
 		$dirname =~ s,/[^/]+$,,;

subsurface-install.pri

@@ -118,9 +118,19 @@ mac {
 		dlls.depends += $(DESTDIR_TARGET)
 
 		nsis.commands += $(CHK_DIR_EXISTS) $$WINDOWSSTAGING;
-		nsis.commands += cat $$NSIINPUTFILE | sed -e \'s/VERSIONTOKEN/$$VERSION_STRING/;s/PRODVTOKEN/$${PRODVERSION_STRING}/\' > $$NSIFILE
+		win64target {
+			nsis.commands += cat $$NSIINPUTFILE | sed -e \'s/VERSIONTOKEN/$$VERSION_STRING/;s/PRODVTOKEN/$${PRODVERSION_STRING}/;s/64BITBUILDTOKEN/1 == 1/\' > $$NSIFILE
+		} else {
+			nsis.commands += cat $$NSIINPUTFILE | sed -e \'s/VERSIONTOKEN/$$VERSION_STRING/;s/PRODVTOKEN/$${PRODVERSION_STRING}/;s/64BITBUILDTOKEN/1 == 0/\' > $$NSIFILE
+		}
 		nsis.depends += $$NSIINPUTFILE
 		nsis.target = $$NSISFILE
+		#
+		# FIXME HACK HACK FIXME  -- this is needed to create working daily builds...
+		#
+		brokenQt532win {
+			installer.commands += cp Qt531/*.dll staging;
+		}
 		installer.commands += $$MAKENSIS $$NSIFILE
 		installer.target = installer
 		installer.depends = nsis install

subsurface.pro

@@ -6,6 +6,7 @@ QT = core gui network svg concurrent
 lessThan(QT_MAJOR_VERSION, 5) {
 	QT += webkit
 } else {
+	QT += printsupport concurrent
 	!android: QT += webkitwidgets webkit
 	android: QT += androidextras
 }
@@ -15,7 +16,7 @@ DEPENDPATH += qt-ui
 mac: TARGET = Subsurface
 else: TARGET = subsurface
 
-VERSION = 4.2
+VERSION = 4.2.1
 
 HEADERS = \
 	color.h \