[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32725] trunk/blender/release/windows/ installer/00.sconsblender.nsi: Fix [#24053] 64-bit Windows installer installs keys to 32-bit registry

[Nathan Letwory]

Revision: 32725
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32725
Author:   jesterking
Date:     2010-10-27 01:52:34 +0200 (Wed, 27 Oct 2010)

Log Message:
-----------
Fix [#24053] 64-bit Windows installer installs keys to 32-bit registry
Reported and patch-suggestion by George Pollard

Modified Paths:
--------------
    trunk/blender/release/windows/installer/00.sconsblender.nsi

Modified: trunk/blender/release/windows/installer/00.sconsblender.nsi
===================================================================
--- trunk/blender/release/windows/installer/00.sconsblender.nsi	2010-10-26 23:32:59 UTC (rev 32724)
+++ trunk/blender/release/windows/installer/00.sconsblender.nsi	2010-10-26 23:52:34 UTC (rev 32725)
@@ -11,7 +11,9 @@
 !include "FileFunc.nsh"
 !include "WordFunc.nsh"
 !include "nsDialogs.nsh"
+!include "x64.nsh"
 
+
 SetCompressor /SOLID lzma
 
 Name "Blender [VERSION]" 
@@ -148,6 +150,9 @@
   [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 @@
 
 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 @@
 
 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"