From: Carl Hetherington <cth@carlh.net>
Date: Tue, 30 Oct 2012 19:11:58 +0000 (+0000)
Subject: Fix up windows 64 build.
X-Git-Tag: v2.0.48~1596
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=ec672e77334379b15639b05384e443a42e29fc09;p=dcpomatic.git

Fix up windows 64 build.
---

diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
index fe02bc757..7820d0078 100644
--- a/windows/installer.nsi.64.in
+++ b/windows/installer.nsi.64.in
@@ -1,4 +1,6 @@
 !include "MUI2.nsh"
+!include "x64.nsh"
+
 Name "DVD-o-matic"
 
 RequestExecutionLevel admin
@@ -24,7 +26,15 @@ InstallDir "$PROGRAMFILES\DVD-o-matic"
 !insertmacro MUI_LANGUAGE "English"
 
 Section "install" "Installation info"
- 
+
+${If} ${RunningX64}
+   DetailPrint "Installer running on 64-bit host"
+   ; disable registry redirection (enable access to 64-bit portion of registry)
+   SetRegView 64
+   ; change install dir
+   StrCpy $INSTDIR "$PROGRAMFILES64\DVD-o-matic"
+${EndIf}
+
 SetOutPath "$INSTDIR\bin"
 
 File "%deps%/bin/asdcp-libdcp.dll"
diff --git a/wscript b/wscript
index 2bc0781e4..10be7109e 100644
--- a/wscript
+++ b/wscript
@@ -85,7 +85,7 @@ def configure(conf):
     			      #include <boost/thread.hpp>\n
     			      int main() { boost::thread t (); }\n
 			      """, msg = 'Checking for boost threading library',
-                              lib = [boost_thread],
+                              lib = [boost_thread, 'boost_system%s' % boost_lib_suffix],
                               uselib_store = 'BOOST_THREAD')
 
     conf.check_cxx(fragment = """