* modules/stream_out/transrate: Rewrote the transrater to use a SAD error

[vlc] / install-win32

diff --git a/install-win32 b/install-win32
index 9449c4c0d902b7e55858f36f9f327b60b429fefa..3a180dca7686b0e7ea51a2a5b90b1a479098fa63 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -60,12 +60,15 @@ Section "Install"
        SetOutPath $INSTDIR\r
 \r
        File  vlc.exe\r
+       File  vlc.exe.manifest\r
        File  *.txt\r
 \r
-       File  /r share\r
        File  /r plugins\r
        File  /r locale\r
        File  /r skins\r
+       File  /r skins2\r
+       File  /r http\r
+       File  /r mozilla\r
 \r
         SetShellVarContext all\r
 \r
@@ -74,19 +77,21 @@ Section "Install"
                        "$INSTDIR\vlc.exe" "--intf wxwin"\r
        CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (skins).lnk" \\r
                        "$INSTDIR\vlc.exe" "--intf skins"\r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\vlc (custom).lnk" \\r
-                       "$INSTDIR\vlc.exe" \r
 \r
         WriteRegStr HKLM \\r
             SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \\r
-            "DisplayName" "VideoLAN VLC media player"\r
+            "DisplayName" "VideoLAN VLC media player ${VERSION}"\r
         WriteRegStr HKLM \\r
             SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN \\r
             "UninstallString" '"$INSTDIR\uninstall.exe"'\r
        WriteUninstaller "uninstall.exe"\r
 \r
-       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Install_Dir" $INSTDIR\r
-       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "version" "${VERSION}"\r
+       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "InstallDir" $INSTDIR\r
+       WriteRegStr HKLM SOFTWARE\VideoLAN\VLC "Version" "${VERSION}"\r
+\r
+        WriteRegStr HKLM \\r
+            SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION} \\r
+            "Path" '"$INSTDIR\mozilla\npvlc.dll"'\r
 \r
        Exec "explorer $SMPROGRAMS\VideoLAN\"\r
 SectionEnd\r
@@ -100,6 +105,9 @@ Section "Uninstall"
        RMDir /r $SMPROGRAMS\VideoLAN\r
        RMDir /r $INSTDIR\r
        DeleteRegKey HKLM SOFTWARE\VideoLAN\r
+        DeleteRegKey HKLM \\r
+            SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}\r
+\r
         DeleteRegKey HKLM \\r
             Software\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN\r
 SectionEnd\r