[vlc-devel] commit: Revert "Desactivate activex until it's fixed" (Jean-Paul Saman )

git version control git at videolan.org
Sat Jun 14 11:05:46 CEST 2008


vlc | branch: master | Jean-Paul Saman <jpsaman at videolan.org> | Sun Jun  8 19:53:58 2008 +0200| [919164ac4d30e90a44a21a35be8377b25f69f804]

Revert "Desactivate activex until it's fixed"

This reverts commit 722f244d86015adc90ec9c7687856d941a5bf207.

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

 extras/package/win32/vlc.win32.nsi.in |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index 948e3b0..2fdf718 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -531,14 +531,14 @@ Section /o "Mozilla plugin" SEC03
 
 SectionEnd
 
-;Section "ActiveX plugin" SEC04
-;  SectionIn 1 3
-;  SetOutPath "$INSTDIR"
-;  !insertmacro OpenUninstallLog
-;  !insertmacro InstallFile activex\axvlc.dll
-;  !insertmacro CloseUninstallLog
-;  RegDLL "$INSTDIR\axvlc.dll"
-;SectionEnd
+Section "ActiveX plugin" SEC04
+  SectionIn 1 3
+  SetOutPath "$INSTDIR"
+  !insertmacro OpenUninstallLog
+  !insertmacro InstallFile activex\axvlc.dll
+  !insertmacro CloseUninstallLog
+  RegDLL "$INSTDIR\axvlc.dll"
+SectionEnd
 
 Section "Discs Playback" SEC05
   SectionIn 1 2 3
@@ -607,8 +607,8 @@ SectionEnd
     "Adds icon to your desktop for easy access"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} \
     "The VLC Mozilla and Mozilla Firefox plugin"
-;  !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} \
-;    "The VLC ActiveX plugin"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} \
+    "The VLC ActiveX plugin"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} \
     "DVD and CD playback registration"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} \




More information about the vlc-devel mailing list