X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=windows%2Finstaller.nsi.64.in;h=615770065453588c958cacf51959f189606d1702;hb=3231e0e975e644d1f1059f6733949dde192e2556;hp=fe02bc75713a6c07f22e3ac3119a095f40a1a4a4;hpb=9d92cbeac32b8b22c9d79b936ac583d60fda5725;p=dcpomatic.git

diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in
index fe02bc757..615770065 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,14 +26,22 @@ 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"
 File "%deps%/bin/avcodec-54.dll"
 File "%deps%/bin/avfilter-3.dll"
 File "%deps%/bin/avformat-54.dll"
-File "%deps%/bin/avutil-51.dll"
+File "%deps%/bin/avutil-52.dll"
 File "%deps%/bin/dcp.dll"
 File "%deps%/bin/libintl-8.dll"
 File "%deps%/bin/kumu-libdcp.dll"
@@ -45,11 +55,13 @@ File "%deps%/bin/libgcc_s_sjlj-1.dll"
 File "%deps%/bin/libgio-2.0-0.dll"
 File "%deps%/bin/libglib-2.0-0.dll"
 File "%deps%/bin/libgobject-2.0-0.dll"
+File "%deps%/bin/libiconv-2.dll"
+File "%deps%/bin/libjpeg-8.dll"
 File "%deps%/bin/libMagick++-5.dll"
 File "%deps%/bin/libMagickCore-5.dll"
 File "%deps%/bin/libMagickWand-5.dll"
 File "%deps%/bin/libopenjpeg-1.dll"
-File "%deps%/bin/libpng14-14.dll"
+File "%deps%/bin/libpng15-15.dll"
 File "%deps%/bin/libsigc-2.0-0.dll"
 File "%deps%/bin/libsndfile-1.dll"
 File "%deps%/bin/libssh.dll"
@@ -59,24 +71,22 @@ File "%deps%/bin/swresample-0.dll"
 File "%deps%/bin/swscale-2.dll"
 File "%deps%/bin/zlib1.dll"
 File "%deps%/bin/libjpeg-8.dll"
-File "%deps%/bin/wxbase28_gcc_custom.dll"
-File "%deps%/bin/wxmsw28_core_gcc_custom.dll"
-File "%deps%/bin/wxmsw28_adv_gcc_custom.dll"
+File "%deps%/bin/wxbase294u_gcc_custom.dll"
+File "%deps%/bin/wxmsw294u_core_gcc_custom.dll"
+File "%deps%/bin/wxmsw294u_adv_gcc_custom.dll"
 File "%deps%/bin/libcairo-2.dll"
-File "%deps%/bin/libfontconfig-1.dll"
-File "%deps%/bin/libexpat-1.dll"
 File "%deps%/bin/libfreetype-6.dll"
 File "%deps%/bin/libgthread-2.0-0.dll"
 File "%deps%/bin/libpango-1.0-0.dll"
 File "%deps%/bin/libgmodule-2.0-0.dll"
 File "%deps%/bin/libpangocairo-1.0-0.dll"
-File "%deps%/bin/libpangoft2-1.0-0.dll"
 File "%deps%/bin/libpangowin32-1.0-0.dll"
 File "%deps%/bin/libtiff-5.dll"
-File "%deps%/bin/libjpeg-8.dll"
 File "%deps%/bin/libglibmm-2.4-1.dll"
 File "%deps%/bin/libxml++-2.6-2.dll"
 File "%deps%/bin/libxml2-2.dll"
+File "%deps%/bin/libpixman-1-0.dll"
+File "%deps%/bin/libfontconfig-1.dll"
 
 File "%binaries%/src/wx/dvdomatic-wx.dll"
 File "%binaries%/src/lib/dvdomatic.dll"
@@ -84,15 +94,18 @@ File "%binaries%/src/tools/dvdomatic.exe"
 File "%binaries%/src/tools/servomatic_cli.exe"
 File "%binaries%/src/tools/servomatic_gui.exe"
 
+# I don't know why, but sometimes it seems that 
+# delegates.xml must be in with the binaries, and
+# sometimes in the $PROFILE.  Meh.
+File "%deps%/etc/ImageMagick/delegates.xml"
 SetOutPath "$PROFILE\.magick"
-
 File "%deps%/etc/ImageMagick/delegates.xml"
 
 CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" ""
 CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" ""
  
 CreateDirectory "$SMPROGRAMS\DVD-o-matic"
-CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
+CreateShortCut "$SMPROGRAMS\DVD-o-matic\Uninstall DVD-o-matic.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
 CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" "$INSTDIR\bin\dvdomatic.exe" 0
 CreateShortCut "$SMPROGRAMS\DVD-o-matic\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" "$INSTDIR\bin\servomatic_gui.exe" 0