From: Rafaël Carré <funman@videolan.org>
Date: Wed, 19 Jun 2013 12:30:45 +0000 (+0200)
Subject: nsis: register x64 axvlc.dll properly
X-Git-Tag: 2.1.0-git~90
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=201655b7910d68a9eb385794a7331113943e3aae;p=vlc

nsis: register x64 axvlc.dll properly
---

diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in b/extras/package/win32/NSIS/vlc.win32.nsi.in
index 56e8b03b23..106661cca4 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"
+@HAVE_WIN64_FALSE@ RegDLL "$INSTDIR\axvlc.dll"
+@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"
+@HAVE_WIN64_FALSE@ UnRegDLL "$INSTDIR\axvlc.dll"
+@HAVE_WIN64_TRUE@  ExecWait 'regsvr32.exe /s /u "$INSTDIR\axvlc.dll"'
   Delete /REBOOTOK "$INSTDIR\axvlc.dll"
   Delete /REBOOTOK "$INSTDIR\axvlc.dll.manifest"