1 files changed, 7 insertions, 59 deletions
diff --git a/win/CS/Installer/Installer.nsi b/win/CS/Installer/Installer.nsi
index 607bfb697..278eb3d8a 100644
--- a/win/CS/Installer/Installer.nsi
+++ b/win/CS/Installer/Installer.nsi
@@ -124,39 +124,18 @@ Section "Handbrake" SEC01
   ${EndIf}
   
   ; Install Files
-  File "Handbrake.exe"
-  File "HandBrakeCLI.exe"
+  File "*.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 "defaultsettings.xml"
-
-  ;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"
+  File "*.dll"
+  File "*.config"
+  File "*.xml"
 
   ; 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"
+  File "doc\*.*"
 SectionEnd
 
 Section -AdditionalIcons
@@ -186,39 +165,8 @@ 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\defaultsettings.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"
+  Delete "$INSTDIR\*.*"
+  Delete "$INSTDIR\doc\*.*"
   RMDir  "$INSTDIR\doc"
   Delete "$SMPROGRAMS\Handbrake\Uninstall.lnk"
   Delete "$DESKTOP\Handbrake.lnk"