6 files changed, 720 insertions, 7 deletions
diff --git a/win/CS/HandBrakeCS.csproj b/win/CS/HandBrakeCS.csproj
index ed1d29c25..081b32feb 100644
--- a/win/CS/HandBrakeCS.csproj
+++ b/win/CS/HandBrakeCS.csproj
@@ -306,6 +306,8 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="Installer\Installer64.nsi" />
+    <None Include="Installer\MakeNightly64.nsi.tmpl" />
     <None Include="Installer\MakeNightly.nsi.tmpl" />
     <None Include="Installer\MakeNightly.nsi" />
     <None Include="Installer\Installer.nsi" />
@@ -418,8 +420,10 @@
   <Import Project="$(ProgramFiles)\MSBuild\StyleCop\v4.5\StyleCop.targets" />
   <PropertyGroup>
     <PreBuildEvent>
-	subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
-	subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
-  subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Installer\MakeNightly.nsi.tmpl" "$(ProjectDir)Installer\MakeNightly.nsi"</PreBuildEvent>
+      subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
+      subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Properties\AssemblyInfo.cs.tmpl" "$(ProjectDir)Properties\AssemblyInfo.cs"
+      subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Installer\MakeNightly.nsi.tmpl" "$(ProjectDir)Installer\MakeNightly.nsi"
+      subwcrev.exe "$(ProjectDir)." "$(ProjectDir)Installer\MakeNightly64.nsi.tmpl" "$(ProjectDir)Installer\MakeNightly64.nsi"
+    </PreBuildEvent>
   </PropertyGroup>
 </Project>
 \ No newline at end of file
diff --git a/win/CS/Installer/Installer.nsi b/win/CS/Installer/Installer.nsi
index 7a6c206a7..3436a804f 100644
--- a/win/CS/Installer/Installer.nsi
+++ b/win/CS/Installer/Installer.nsi
@@ -214,7 +214,7 @@ Section Uninstall
   Delete "$INSTDIR\doc\NEWS"
   Delete "$INSTDIR\doc\THANKS"
   Delete "$INSTDIR\doc\TRANSLATIONS"
-  RMDir  "$INSTDIR"
+  RMDir  "$INSTDIR\doc"
   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
   Delete "$DESKTOP\Handbrake.lnk"
   Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"
diff --git a/win/CS/Installer/Installer64.nsi b/win/CS/Installer/Installer64.nsi
new file mode 100644
index 000000000..f055e15cb
--- /dev/null
+++ b/win/CS/Installer/Installer64.nsi
@@ -0,0 +1,361 @@
+/*  Resources.Designer.cs $
+
+ 	   This file is part of the HandBrake source code.
+ 	   Homepage: <http://handbrake.fr/>.
+ 	   It may be used under the terms of the GNU General Public License. */
+
+; Script generated by the HM NIS Edit Script Wizard.
+
+; HM NIS Edit Wizard helper defines
+!define PRODUCT_NAME "HandBrake"
+!define PRODUCT_VERSION "0.9.6"
+!define PRODUCT_VERSION_NUMBER "0.9.6"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+
+;Required .NET framework
+!define MIN_FRA_MAJOR "4"
+!define MIN_FRA_MINOR "0"
+!define MIN_FRA_BUILD "*"
+
+SetCompressor lzma
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+!define MUI_ICON "handbrakepineapple.ico"
+!define MUI_UNICON "handbrakepineapple.ico"
+
+; Welcome page
+!insertmacro MUI_PAGE_WELCOME
+; License page
+!insertmacro MUI_PAGE_LICENSE "doc\COPYING"
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"
+!insertmacro MUI_PAGE_FINISH
+
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Language files
+!insertmacro MUI_LANGUAGE "English"
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe"
+
+!include WordFunc.nsh
+!insertmacro VersionCompare
+!include LogicLib.nsh
+
+InstallDir "$PROGRAMFILES64\Handbrake"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+Var InstallDotNET
+
+Function .onInit
+
+  ; Begin Only allow one version
+  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'
+  Pop $R0
+
+  StrCmp $R0 0 +3
+  MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running."
+  Abort
+
+  ;Remove previous version
+  ReadRegStr $R0 HKLM \
+  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
+  "UninstallString"
+  StrCmp $R0 "" done
+
+  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
+  previous version or `Cancel` to continue." \
+  IDOK uninst
+  goto done
+
+ ;Run the uninstaller
+  uninst:
+   Exec $INSTDIR\uninst.exe
+  done:
+FunctionEnd
+
+Section "Handbrake" SEC01
+  SetOutPath "$INSTDIR"
+  SetOverwrite ifnewer
+
+  ; Begin Check .NET version
+  StrCpy $InstallDotNET "No"
+  Call CheckFramework
+     StrCmp $0 "1" +3
+        StrCpy $InstallDotNET "Yes"
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}."
+     Pop $0
+
+  ; Get .NET if required
+  ${If} $InstallDotNET == "Yes"
+     SetDetailsView hide
+     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&SrcFamilyId=9CFB2D51-5FF4-4491-B0E5-B386F32C0992&SrcDisplayLang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f1%2fB%2fE%2f1BE39E79-7E39-46A3-96FF-047F95396215%2fdotNetFx40_Full_setup.exe" "$INSTDIR\dotnetfx.exe" /end
+     Pop $1
+
+     ${If} $1 != "OK"
+           Delete "$INSTDIR\dotnetfx.exe"
+           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"
+     ${EndIf}
+
+     ExecWait "$INSTDIR\dotnetfx.exe"
+     Delete "$INSTDIR\dotnetfx.exe"
+
+     SetDetailsView show
+  ${EndIf}
+  
+  ; Install Files
+  File "Handbrake.exe"
+  File "HandBrakeCLI.exe"
+  CreateDirectory "$SMPROGRAMS\Handbrake"
+  CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
+  CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
+  File "Growl.Connector.dll"
+  File "Growl.CoreLibrary.dll"
+  File "Handbrake.exe.config"
+  File "HandBrake.ApplicationServices.dll"
+  File "Microsoft.WindowsAPICodePack.Shell.dll"
+  File "Microsoft.WindowsAPICodePack.dll"
+  File "HandBrakeInterop.dll"
+  File "SplitButton.dll"
+  File "Ookii.Dialogs.Wpf.dll"
+
+  ;File "Caliburn.Castle.dll"
+  ;File "Caliburn.Core.dll"
+  ;File "Castle.Core.dll"
+  ;File "Castle.DynamicProxy2.dll"
+  ;File "Castle.MicroKernel.dll"
+  ;File "Castle.Windsor.dll"
+  ;File "Microsoft.Practices.ServiceLocation.dll"
+
+  ; Copy the standard doc set into the doc folder
+  SetOutPath "$INSTDIR\doc"
+  SetOverwrite ifnewer
+  File "doc\AUTHORS"
+  File "doc\COPYING"
+  File "doc\CREDITS"
+  File "doc\NEWS"
+  File "doc\THANKS"
+  File "doc\TRANSLATIONS"
+SectionEnd
+
+Section -AdditionalIcons
+  CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
+SectionEnd
+
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+SectionEnd
+
+
+Function un.onUninstSuccess
+  HideWindow
+  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
+FunctionEnd
+
+Function un.onInit
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
+  Abort
+FunctionEnd
+
+Section Uninstall
+  Delete "$INSTDIR\uninst.exe"
+  
+  Delete "$INSTDIR\Interop.QTOLibrary.dll"
+  Delete "$INSTDIR\Interop.QTOControlLib.dll"
+  Delete "$INSTDIR\AxInterop.QTOControlLib.dll"
+  Delete "$INSTDIR\HandBrakeCLI.exe"
+  Delete "$INSTDIR\handbrakepineapple.ico"
+  Delete "$INSTDIR\Handbrake.exe"
+  Delete "$INSTDIR\Handbrake.exe.config"
+  Delete "$INSTDIR\Growl.Connector.dll"
+  Delete "$INSTDIR\Growl.CoreLibrary.dll"
+  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
+  Delete "$INSTDIR\HandBrake.ApplicationServices.dll"
+  Delete "$INSTDIR\HandBrake.Framework.dll"
+  Delete "$INSTDIR\Microsoft.WindowsAPICodePack.Shell.dll"
+  Delete "$INSTDIR\Microsoft.WindowsAPICodePack.dll"
+  Delete "$INSTDIR\HandBrakeInterop.dll"
+  Delete "$INSTDIR\SplitButton.dll"
+
+  Delete "$INSTDIR\Caliburn.Castle.dll"
+  Delete "$INSTDIR\Caliburn.Core.dll"
+  Delete "$INSTDIR\Castle.Core.dll"
+  Delete "$INSTDIR\Castle.DynamicProxy2.dll"
+  Delete "$INSTDIR\Castle.MicroKernel.dll"
+  Delete "$INSTDIR\Castle.Windsor.dll"
+  Delete "$INSTDIR\Microsoft.Practices.ServiceLocation.dll"
+  Delete "$INSTDIR\Ookii.Dialogs.Wpf.dll"
+
+  Delete "$INSTDIR\doc\AUTHORS"
+  Delete "$INSTDIR\doc\COPYING"
+  Delete "$INSTDIR\doc\CREDITS"
+  Delete "$INSTDIR\doc\NEWS"
+  Delete "$INSTDIR\doc\THANKS"
+  Delete "$INSTDIR\doc\TRANSLATIONS"
+  RMDir  "$INSTDIR\doc"
+  Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
+  Delete "$DESKTOP\Handbrake.lnk"
+  Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"
+  RMDir  "$SMPROGRAMS\Handbrake"
+  RMDir  "$INSTDIR"
+
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  SetAutoClose true
+SectionEnd
+
+;Check for .NET framework
+Function CheckFrameWork
+
+   ;Save the variables in case something else is using them
+  Push $0
+  Push $1
+  Push $2
+  Push $3
+  Push $4
+  Push $R1
+  Push $R2
+  Push $R3
+  Push $R4
+  Push $R5
+  Push $R6
+  Push $R7
+  Push $R8
+
+  StrCpy $R5 "0"
+  StrCpy $R6 "0"
+  StrCpy $R7 "0"
+  StrCpy $R8 "0.0.0"
+  StrCpy $0 0
+
+  loop:
+
+  ;Get each sub key under "SOFTWARE\Microsoft\NET Framework Setup\NDP"
+  EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
+  StrCmp $1 "" done ;jump to end if no more registry keys
+  IntOp $0 $0 + 1
+  StrCpy $2 $1 1 ;Cut off the first character
+  StrCpy $3 $1 "" 1 ;Remainder of string
+
+  ;Loop if first character is not a 'v'
+  StrCmpS $2 "v" start_parse loop
+
+  ;Parse the string
+  start_parse:
+  StrCpy $R1 ""
+  StrCpy $R2 ""
+  StrCpy $R3 ""
+  StrCpy $R4 $3
+
+  StrCpy $4 1
+
+  parse:
+  StrCmp $3 "" parse_done ;If string is empty, we are finished
+  StrCpy $2 $3 1 ;Cut off the first character
+  StrCpy $3 $3 "" 1 ;Remainder of string
+  StrCmp $2 "." is_dot not_dot ;Move to next part if it's a dot
+
+  is_dot:
+  IntOp $4 $4 + 1 ; Move to the next section
+  goto parse ;Carry on parsing
+
+  not_dot:
+  IntCmp $4 1 major_ver
+  IntCmp $4 2 minor_ver
+  IntCmp $4 3 build_ver
+  IntCmp $4 4 parse_done
+
+  major_ver:
+  StrCpy $R1 $R1$2
+  goto parse ;Carry on parsing
+
+  minor_ver:
+  StrCpy $R2 $R2$2
+  goto parse ;Carry on parsing
+
+  build_ver:
+  StrCpy $R3 $R3$2
+  goto parse ;Carry on parsing
+
+  parse_done:
+
+  IntCmp $R1 $R5 this_major_same loop this_major_more
+  this_major_more:
+  StrCpy $R5 $R1
+  StrCpy $R6 $R2
+  StrCpy $R7 $R3
+  StrCpy $R8 $R4
+
+  goto loop
+
+  this_major_same:
+  IntCmp $R2 $R6 this_minor_same loop this_minor_more
+  this_minor_more:
+  StrCpy $R6 $R2
+  StrCpy $R7 R3
+  StrCpy $R8 $R4
+  goto loop
+
+  this_minor_same:
+  IntCmp $R3 $R7 loop loop this_build_more
+  this_build_more:
+  StrCpy $R7 $R3
+  StrCpy $R8 $R4
+  goto loop
+
+  done:
+
+  ;Have we got the framework we need?
+  IntCmp $R5 ${MIN_FRA_MAJOR} max_major_same fail OK
+  max_major_same:
+  IntCmp $R6 ${MIN_FRA_MINOR} max_minor_same fail OK
+  max_minor_same:
+  IntCmp $R7 ${MIN_FRA_BUILD} OK fail OK
+
+  ;Version on machine is greater than what we need
+  OK:
+  StrCpy $0 "1"
+  goto end
+
+  fail:
+  StrCmp $R8 "0.0.0" end
+
+
+  end:
+
+  ;Pop the variables we pushed earlier
+  Pop $R8
+  Pop $R7
+  Pop $R6
+  Pop $R5
+  Pop $R4
+  Pop $R3
+  Pop $R2
+  Pop $R1
+  Pop $4
+  Pop $3
+  Pop $2
+  Pop $1
+FunctionEnd
+\ No newline at end of file
diff --git a/win/CS/Installer/MakeNightly.nsi.tmpl b/win/CS/Installer/MakeNightly.nsi.tmpl
index a005ec983..bdcd4d7c8 100644
--- a/win/CS/Installer/MakeNightly.nsi.tmpl
+++ b/win/CS/Installer/MakeNightly.nsi.tmpl
@@ -197,7 +197,7 @@ Section Uninstall
   Delete "$INSTDIR\doc\NEWS"
   Delete "$INSTDIR\doc\THANKS"
   Delete "$INSTDIR\doc\TRANSLATIONS"
-  RMDir  "$INSTDIR"
+  RMDir  "$INSTDIR\doc"
   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
   Delete "$DESKTOP\Handbrake.lnk"
   Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"
diff --git a/win/CS/Installer/MakeNightly64.nsi.tmpl b/win/CS/Installer/MakeNightly64.nsi.tmpl
new file mode 100644
index 000000000..40e8b3cf3
--- /dev/null
+++ b/win/CS/Installer/MakeNightly64.nsi.tmpl
@@ -0,0 +1,344 @@
+/*  Resources.Designer.cs $
+
+ 	   This file is part of the HandBrake source code.
+ 	   Homepage: <http://handbrake.fr/>.
+ 	   It may be used under the terms of the GNU General Public License. */
+
+; Script generated by the HM NIS Edit Script Wizard.
+
+; HM NIS Edit Wizard helper defines
+!define PRODUCT_NAME "Handbrake"
+!define PRODUCT_VERSION "$WCREV$ Nightly"
+!define PRODUCT_VERSION_NUMBER "svn$WCREV$"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+
+;Required .NET framework
+!define MIN_FRA_MAJOR "4"
+!define MIN_FRA_MINOR "0"
+!define MIN_FRA_BUILD "*"
+
+SetCompressor lzma
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+!define MUI_ICON "handbrakepineapple.ico"
+!define MUI_UNICON "handbrakepineapple.ico"
+
+; Welcome page
+!insertmacro MUI_PAGE_WELCOME
+; License page
+!insertmacro MUI_PAGE_LICENSE "doc\COPYING"
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+!define MUI_FINISHPAGE_RUN "$INSTDIR\Handbrake.exe"
+!insertmacro MUI_PAGE_FINISH
+
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Language files
+!insertmacro MUI_LANGUAGE "English"
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
+OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}_x86_64-Win_GUI.exe"
+
+!include WordFunc.nsh
+!insertmacro VersionCompare
+!include LogicLib.nsh
+
+InstallDir "$PROGRAMFILES64\Handbrake"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+Var InstallDotNET
+
+Function .onInit
+
+  ; Begin Only allow one version
+  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'
+  Pop $R0
+
+  StrCmp $R0 0 +3
+  MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running."
+  Abort
+
+  ;Remove previous version
+  ReadRegStr $R0 HKLM \
+  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \
+  "UninstallString"
+  StrCmp $R0 "" done
+
+  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
+  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \
+  previous version or `Cancel` to continue." \
+  IDOK uninst
+  goto done
+
+ ;Run the uninstaller
+  uninst:
+   Exec $INSTDIR\uninst.exe
+  done:
+FunctionEnd
+
+Section "Handbrake" SEC01
+  SetOutPath "$INSTDIR"
+  SetOverwrite ifnewer
+
+  ; Begin Check .NET version
+  StrCpy $InstallDotNET "No"
+  Call CheckFramework
+     StrCmp $0 "1" +3
+        StrCpy $InstallDotNET "Yes"
+      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}."
+     Pop $0
+
+  ; Get .NET if required
+  ${If} $InstallDotNET == "Yes"
+     SetDetailsView hide
+     inetc::get /caption "Downloading .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&SrcFamilyId=9CFB2D51-5FF4-4491-B0E5-B386F32C0992&SrcDisplayLang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f1%2fB%2fE%2f1BE39E79-7E39-46A3-96FF-047F95396215%2fdotNetFx40_Full_setup.exe" "$INSTDIR\dotnetfx.exe" /end
+     Pop $1
+
+     ${If} $1 != "OK"
+           Delete "$INSTDIR\dotnetfx.exe"
+           Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"
+     ${EndIf}
+
+     ExecWait "$INSTDIR\dotnetfx.exe"
+     Delete "$INSTDIR\dotnetfx.exe"
+
+     SetDetailsView show
+  ${EndIf}
+  
+  ; Install Files
+  File "Handbrake.exe"
+  File "HandBrakeCLI.exe"
+  CreateDirectory "$SMPROGRAMS\Handbrake"
+  CreateShortCut "$SMPROGRAMS\Handbrake\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
+  CreateShortCut "$DESKTOP\Handbrake.lnk" "$INSTDIR\Handbrake.exe"
+  File "Growl.Connector.dll"
+  File "Growl.CoreLibrary.dll"
+  File "Handbrake.exe.config"
+  File "HandBrake.ApplicationServices.dll"
+  File "Microsoft.WindowsAPICodePack.Shell.dll"
+  File "Microsoft.WindowsAPICodePack.dll"
+  File "HandBrakeInterop.dll"
+  File "SplitButton.dll"
+  File "Ookii.Dialogs.Wpf.dll"
+
+  ; Copy the standard doc set into the doc folder
+  SetOutPath "$INSTDIR\doc"
+  SetOverwrite ifnewer
+  File "doc\AUTHORS"
+  File "doc\COPYING"
+  File "doc\CREDITS"
+  File "doc\NEWS"
+  File "doc\THANKS"
+  File "doc\TRANSLATIONS"
+SectionEnd
+
+Section -AdditionalIcons
+  CreateShortCut "$SMPROGRAMS\Handbrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
+SectionEnd
+
+Section -Post
+  WriteUninstaller "$INSTDIR\uninst.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Handbrake.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Handbrake.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+SectionEnd
+
+
+Function un.onUninstSuccess
+  HideWindow
+  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
+FunctionEnd
+
+Function un.onInit
+  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
+  Abort
+FunctionEnd
+
+Section Uninstall
+  Delete "$INSTDIR\uninst.exe"
+  
+  Delete "$INSTDIR\Interop.QTOLibrary.dll"
+  Delete "$INSTDIR\Interop.QTOControlLib.dll"
+  Delete "$INSTDIR\AxInterop.QTOControlLib.dll"
+  Delete "$INSTDIR\HandBrakeCLI.exe"
+  Delete "$INSTDIR\handbrakepineapple.ico"
+  Delete "$INSTDIR\Handbrake.exe"
+  Delete "$INSTDIR\Handbrake.exe.config"
+  Delete "$INSTDIR\Growl.Connector.dll"
+  Delete "$INSTDIR\Growl.CoreLibrary.dll"
+  Delete "$INSTDIR\libgcc_s_sjlj-1.dll"
+  Delete "$INSTDIR\HandBrake.ApplicationServices.dll"
+  Delete "$INSTDIR\Microsoft.WindowsAPICodePack.Shell.dll"
+  Delete "$INSTDIR\Microsoft.WindowsAPICodePack.dll"
+  Delete "$INSTDIR\HandBrakeInterop.dll"
+  Delete "$INSTDIR\SplitButton.dll"
+  Delete "$INSTDIR\Ookii.Dialogs.Wpf.dll"
+
+  Delete "$INSTDIR\doc\AUTHORS"
+  Delete "$INSTDIR\doc\COPYING"
+  Delete "$INSTDIR\doc\CREDITS"
+  Delete "$INSTDIR\doc\NEWS"
+  Delete "$INSTDIR\doc\THANKS"
+  Delete "$INSTDIR\doc\TRANSLATIONS"
+  RMDir  "$INSTDIR\doc"
+  Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
+  Delete "$DESKTOP\Handbrake.lnk"
+  Delete "$SMPROGRAMS\Handbrake\Handbrake.lnk"
+  RMDir  "$SMPROGRAMS\Handbrake"
+  RMDir  "$INSTDIR"
+
+  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  SetAutoClose true
+SectionEnd
+
+;Check for .NET framework
+Function CheckFrameWork
+
+   ;Save the variables in case something else is using them
+  Push $0
+  Push $1
+  Push $2
+  Push $3
+  Push $4
+  Push $R1
+  Push $R2
+  Push $R3
+  Push $R4
+  Push $R5
+  Push $R6
+  Push $R7
+  Push $R8
+
+  StrCpy $R5 "0"
+  StrCpy $R6 "0"
+  StrCpy $R7 "0"
+  StrCpy $R8 "0.0.0"
+  StrCpy $0 0
+
+  loop:
+
+  ;Get each sub key under "SOFTWARE\Microsoft\NET Framework Setup\NDP"
+  EnumRegKey $1 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP" $0
+  StrCmp $1 "" done ;jump to end if no more registry keys
+  IntOp $0 $0 + 1
+  StrCpy $2 $1 1 ;Cut off the first character
+  StrCpy $3 $1 "" 1 ;Remainder of string
+
+  ;Loop if first character is not a 'v'
+  StrCmpS $2 "v" start_parse loop
+
+  ;Parse the string
+  start_parse:
+  StrCpy $R1 ""
+  StrCpy $R2 ""
+  StrCpy $R3 ""
+  StrCpy $R4 $3
+
+  StrCpy $4 1
+
+  parse:
+  StrCmp $3 "" parse_done ;If string is empty, we are finished
+  StrCpy $2 $3 1 ;Cut off the first character
+  StrCpy $3 $3 "" 1 ;Remainder of string
+  StrCmp $2 "." is_dot not_dot ;Move to next part if it's a dot
+
+  is_dot:
+  IntOp $4 $4 + 1 ; Move to the next section
+  goto parse ;Carry on parsing
+
+  not_dot:
+  IntCmp $4 1 major_ver
+  IntCmp $4 2 minor_ver
+  IntCmp $4 3 build_ver
+  IntCmp $4 4 parse_done
+
+  major_ver:
+  StrCpy $R1 $R1$2
+  goto parse ;Carry on parsing
+
+  minor_ver:
+  StrCpy $R2 $R2$2
+  goto parse ;Carry on parsing
+
+  build_ver:
+  StrCpy $R3 $R3$2
+  goto parse ;Carry on parsing
+
+  parse_done:
+
+  IntCmp $R1 $R5 this_major_same loop this_major_more
+  this_major_more:
+  StrCpy $R5 $R1
+  StrCpy $R6 $R2
+  StrCpy $R7 $R3
+  StrCpy $R8 $R4
+
+  goto loop
+
+  this_major_same:
+  IntCmp $R2 $R6 this_minor_same loop this_minor_more
+  this_minor_more:
+  StrCpy $R6 $R2
+  StrCpy $R7 R3
+  StrCpy $R8 $R4
+  goto loop
+
+  this_minor_same:
+  IntCmp $R3 $R7 loop loop this_build_more
+  this_build_more:
+  StrCpy $R7 $R3
+  StrCpy $R8 $R4
+  goto loop
+
+  done:
+
+  ;Have we got the framework we need?
+  IntCmp $R5 ${MIN_FRA_MAJOR} max_major_same fail OK
+  max_major_same:
+  IntCmp $R6 ${MIN_FRA_MINOR} max_minor_same fail OK
+  max_minor_same:
+  IntCmp $R7 ${MIN_FRA_BUILD} OK fail OK
+
+  ;Version on machine is greater than what we need
+  OK:
+  StrCpy $0 "1"
+  goto end
+
+  fail:
+  StrCmp $R8 "0.0.0" end
+
+
+  end:
+
+  ;Pop the variables we pushed earlier
+  Pop $R8
+  Pop $R7
+  Pop $R6
+  Pop $R5
+  Pop $R4
+  Pop $R3
+  Pop $R2
+  Pop $R1
+  Pop $4
+  Pop $3
+  Pop $2
+  Pop $1
+FunctionEnd
+\ No newline at end of file
diff --git a/win/CS/build.xml b/win/CS/build.xml
index d45c2d1ae..89921f719 100644
--- a/win/CS/build.xml
+++ b/win/CS/build.xml
@@ -41,10 +41,14 @@
   
   <!-- Events -->
   <Target Name="NightlyPostBuildEvent">
-    <Exec Command="copy $(ProjectDir)Installer\MakeNightly.nsi $(ProjectDir)bin\$(Platform)\Release /Y" />
+    <Exec Command="copy $(ProjectDir)Installer\MakeNightly.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x86'" />
+    <Exec Command="copy $(ProjectDir)Installer\MakeNightly64.nsi $(ProjectDir)bin\$(Platform)\Release /Y" Condition="$(Platform) == 'x64'" />
+    
     <Exec Command="copy $(ProjectDir)handbrakepineapple.ico $(ProjectDir)bin\$(Platform)\Release /Y" />
     <Exec Command="xcopy $(ProjectDir)doc $(ProjectDir)bin\$(Platform)\Release\doc /I /Y" />
-    <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\MakeNightly.nsi" />
+    
+    <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\MakeNightly.nsi" Condition="$(Platform) == 'x86'" />
+    <Exec Command="makensis $(ProjectDir)bin\$(Platform)\Release\MakeNightly64.nsi" Condition="$(Platform) == 'x64'" />
   </Target>
 
 </Project>
 \ No newline at end of file