vlc | branch: master | Rafaël Carré <[email protected]> | Mon Oct 11 19:54:58 2010 +0200| [e5fd6dfb2c32ab3ed90b0415060a314f5dd0bce8] | committer: Rafaël Carré
Remove mention of mozilla plugin in win32 installer and configure scripts > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e5fd6dfb2c32ab3ed90b0415060a314f5dd0bce8 --- extras/package/win32/configure-common.sh | 1 - extras/package/win32/configure-mingw64.sh | 2 +- extras/package/win32/vlc.win32.nsi.in | 28 ---------------------------- 3 files changed, 1 insertions(+), 30 deletions(-) diff --git a/extras/package/win32/configure-common.sh b/extras/package/win32/configure-common.sh index f405a9b..7ffacee 100755 --- a/extras/package/win32/configure-common.sh +++ b/extras/package/win32/configure-common.sh @@ -28,7 +28,6 @@ fi --enable-portaudio \ --enable-sdl \ --enable-qt4 \ - --enable-mozilla --with-mozilla-sdk-path=$CONTRIBS/gecko-sdk \ --enable-activex \ --enable-sse --enable-mmx \ --enable-libcddb \ diff --git a/extras/package/win32/configure-mingw64.sh b/extras/package/win32/configure-mingw64.sh index 6ff70f1..e0c488f 100755 --- a/extras/package/win32/configure-mingw64.sh +++ b/extras/package/win32/configure-mingw64.sh @@ -18,5 +18,5 @@ CC=amd64-mingw32msvc-gcc CXX=amd64-mingw32msvc-g++ \ CONFIGURE="${root}configure" \ CONFIGOPTS="--host=amd64-mingw32msvc --build=i386-linux --enable-dirac --enable-mkv --enable-taglib --enable-debug --enable-projectm - --disable-qt4 --disable-skins2 --disable-activex --disable-mozilla" \ + --disable-qt4 --disable-skins2 --disable-activex" \ sh ${root}extras/package/win32/configure-common.sh diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in index 3b24f8e..526e970 100644 --- a/extras/package/win32/vlc.win32.nsi.in +++ b/extras/package/win32/vlc.win32.nsi.in @@ -992,34 +992,6 @@ Section "un.$Name_Section91" SEC91 Delete /REBOOTOK "$INSTDIR\axvlc.dll" Delete /REBOOTOK "$INSTDIR\axvlc.dll.manifest" - ;remove mozilla plugin - Push $R0 - Push $R1 - Push $R2 - - !define Index 'Line${__LINE__}' - StrCpy $R1 "0" - - "${Index}-Loop:" - - ; Check for Key - EnumRegKey $R0 HKLM "SOFTWARE\Mozilla" "$R1" - StrCmp $R0 "" "${Index}-End" - IntOp $R1 $R1 + 1 - ReadRegStr $R2 HKLM "SOFTWARE\Mozilla\$R0\Extensions" "Plugins" - StrCmp $R2 "" "${Index}-Loop" "" - - ; old files (0.8.5 and before) that may be lying around - Delete /REBOOTOK "$R2\npvlc.dll" - Delete /REBOOTOK "$R2\libvlc.dll" - Delete /REBOOTOK "$R2\vlcintf.xpt" - Goto "${Index}-Loop" - - "${Index}-End:" - !undef Index - Delete /REBOOTOK "$INSTDIR\npvlc.dll" - Delete /REBOOTOK "$INSTDIR\npvlc.dll.manifest" - RMDir "$SMPROGRAMS\VideoLAN" RMDir /r $SMPROGRAMS\VideoLAN _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
