]> git.sesse.net Git - vlc/commitdiff
nsis: register x64 axvlc.dll properly
authorRafaël Carré <funman@videolan.org>
Wed, 19 Jun 2013 12:30:45 +0000 (14:30 +0200)
committerRafaël Carré <funman@videolan.org>
Wed, 19 Jun 2013 12:30:45 +0000 (14:30 +0200)
extras/package/win32/NSIS/vlc.win32.nsi.in

index 56e8b03b2325a5e88e89dc48274e7eedf6c85280..106661cca40cf725c3a23872cb338dbf88a12c59 100644 (file)
@@ -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"