[vlc-commits] nsis: register x64 axvlc.dll properly

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Wed Jun 19 14:30:45 2013 +0200| [201655b7910d68a9eb385794a7331113943e3aae] | committer: Rafaël Carré

nsis: register x64 axvlc.dll properly

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=201655b7910d68a9eb385794a7331113943e3aae
---

 extras/package/win32/NSIS/vlc.win32.nsi.in |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in b/extras/package/win32/NSIS/vlc.win32.nsi.in
index 56e8b03..106661c 100644
--- a/extras/package/win32/NSIS/vlc.win32.nsi.in
+++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
@@ -285,7 +285,8 @@ Section $Name_Section04 SEC04
   !insertmacro InstallFile axvlc.dll
   !insertmacro InstallFile axvlc.dll.manifest
   !insertmacro CloseUninstallLog
-  RegDLL "$INSTDIR\axvlc.dll"
+ at HAVE_WIN64_FALSE@ RegDLL "$INSTDIR\axvlc.dll"
+ at HAVE_WIN64_TRUE@  ExecWait 'regsvr32.exe /s "$INSTDIR\axvlc.dll"'
 SectionEnd
 !endif
 SectionGroupEnd
@@ -697,7 +698,8 @@ Section "un.$Name_Section91" SEC91
   !insertmacro DeleteContextMenuExt "Directory"
 
   ;remove activex plugin
-  UnRegDLL "$INSTDIR\axvlc.dll"
+ at HAVE_WIN64_FALSE@ UnRegDLL "$INSTDIR\axvlc.dll"
+ at HAVE_WIN64_TRUE@  ExecWait 'regsvr32.exe /s /u "$INSTDIR\axvlc.dll"'
   Delete /REBOOTOK "$INSTDIR\axvlc.dll"
   Delete /REBOOTOK "$INSTDIR\axvlc.dll.manifest"