[vlmc-devel] commit: Win32: update installer (Jean-Baptiste Kempf )

[git at videolan.org]

vlmc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Sep 17 15:39:12 2010 +0200| [5d892b619ae0ddd7667fc7bb3af5d4d47f460462] | committer: Hugo Beauzée-Luyssen 

Win32: update installer

Signed-off-by: Hugo Beauzée-Luyssen <beauze.h at gmail.com>

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=5d892b619ae0ddd7667fc7bb3af5d4d47f460462
---

 nsis/installer.nsi |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/nsis/installer.nsi b/nsis/installer.nsi
index 9ac8bd4..a027ca7 100644
--- a/nsis/installer.nsi
+++ b/nsis/installer.nsi
@@ -61,12 +61,12 @@ Section "@PROJECT_NAME_SHORT@ (required)"
   ; Put file there
   File "libvlc.dll"
   File "libvlccore.dll"
-  File "mingwm10.dll"
-  File "libgcc_s_dw2-1.dll"
-  File "QtCore4.dll"
-  File "QtGui4.dll"
-  File "QtSvg4.dll"
-  File "QtXml4.dll"
+;  File "mingwm10.dll"
+;  File "libgcc_s_dw2-1.dll"
+;  File "QtCore4.dll"
+;  File "QtGui4.dll"
+;  File "QtSvg4.dll"
+;  File "QtXml4.dll"
   File "vlmc.exe"
   File "@CMAKE_SOURCE_DIR@/share/vlmc.ico"
   File "@CMAKE_SOURCE_DIR@/COPYING"
@@ -74,7 +74,7 @@ Section "@PROJECT_NAME_SHORT@ (required)"
   File "@CMAKE_SOURCE_DIR@/TRANSLATORS"
   File "@CMAKE_SOURCE_DIR@/NEWS"
   File /r "plugins"
-  File /r "effects"
+  ;File /r /nonfatal "effects"
 
   ; Write the installation path into the registry
   WriteRegStr HKLM "Software\@PROJECT_NAME_SHORT@" "Install_Dir" "$INSTDIR"
@@ -120,20 +120,20 @@ Section "Uninstall"
   Delete "$INSTDIR\uninstall.exe"
   Delete "$INSTDIR\libvlc.dll"
   Delete "$INSTDIR\libvlccore.dll"
-  Delete "$INSTDIR\mingwm10.dll"
-  Delete "$INSTDIR\libgcc_s_dw2-1.dll"
-  Delete "$INSTDIR\QtCore4.dll"
-  Delete "$INSTDIR\QtGui4.dll"
-  Delete "$INSTDIR\QtSvg4.dll"
-  Delete "$INSTDIR\QtXml4.dll"
+;  Delete "$INSTDIR\mingwm10.dll"
+;  Delete "$INSTDIR\libgcc_s_dw2-1.dll"
+;  Delete "$INSTDIR\QtCore4.dll"
+;  Delete "$INSTDIR\QtGui4.dll"
+;  Delete "$INSTDIR\QtSvg4.dll"
+;  Delete "$INSTDIR\QtXml4.dll"
   Delete "$INSTDIR\COPYING"
   Delete "$INSTDIR\AUTHORS"
   Delete "$INSTDIR\TRANSLATORS"
   Delete "$INSTDIR\NEWS"
   Delete "$INSTDIR\plugins\*.*"
-  Delete "$INSTDIR\effects\*.*"
+;  Delete "$INSTDIR\effects\*.*"
   RMDir "$INSTDIR\plugins"
-  RMDir "$INSTDIR\effects"
+;  RMDir "$INSTDIR\effects"
 
   ; Remove shortcuts, if any
   Delete "$SMPROGRAMS\@PROJECT_NAME_LONG@\*.*"