From 16e478cdb7db4cf8907d8c79d0de69896846f102 Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Tue, 26 Oct 2010 23:52:34 +0000
Subject: Fix [#24053] 64-bit Windows installer installs keys to 32-bit
 registry Reported and patch-suggestion by George Pollard

---
 release/windows/installer/00.sconsblender.nsi | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'release/windows')

diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi
index 4a6a2ca4d8a..7edb0924131 100644
--- a/release/windows/installer/00.sconsblender.nsi
+++ b/release/windows/installer/00.sconsblender.nsi
@@ -11,6 +11,8 @@
 !include "FileFunc.nsh"
 !include "WordFunc.nsh"
 !include "nsDialogs.nsh"
+!include "x64.nsh"
+
 
 SetCompressor /SOLID lzma
 
@@ -148,6 +150,9 @@ Section "Blender-[VERSION] (required)" SecCopyUI
   [DODATAFILES]
   
   SetOutPath $INSTDIR
+  ${If} ${RunningX64}
+    SetRegView 64
+  ${EndIf}
   ; Write the installation path into the registry
   WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "Install_Dir" "$INSTDIR"
   WriteRegStr HKLM "SOFTWARE\BlenderFoundation" "ConfigData_Dir" "$BLENDERHOME"
@@ -179,6 +184,9 @@ SectionEnd
 
 Section "Open .blend files with Blender-[VERSION]" Section4
   
+  ${If} ${RunningX64}
+    SetRegView 64
+  ${EndIf}
   WriteRegStr HKCR ".blend" "" "blendfile"
   WriteRegStr HKCR "blendfile" "" "Blender .blend File"
   WriteRegStr HKCR "blendfile\shell" "" "open"
@@ -192,6 +200,9 @@ UninstallText "This will uninstall Blender [VERSION], and all installed files. B
 
 Section "Uninstall"
   ; remove registry keys
+  ${If} ${RunningX64}
+    SetRegView 64
+  ${EndIf}
   ReadRegStr $BLENDERHOME HKLM "SOFTWARE\BlenderFoundation" "ConfigData_Dir"
   ReadRegStr $SHORTVERSION HKLM "SOFTWARE\BlenderFoundation" "ShortVersion"
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender"
-- 
cgit v1.2.3