* modules/demux/ogg.c: fix for ogg web streams.

[vlc] / install-win32

diff --git a/install-win32 b/install-win32
index 0106100989f598742e366f1d9640896061c60a60..6a065905956cb22b9cb0d9498250102689a4773f 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -25,6 +25,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;\r
 \r
 OutFile ..\vlc-${VERSION}-win32.exe\r
+SetCompressor bzip2\r
 \r
 Name "VLC media player"\r
 Caption "VLC '${VERSION}' for Win32 Setup"\r
@@ -33,6 +34,7 @@ Caption "VLC '${VERSION}' for Win32 Setup"
 CRCCheck on\r
 \r
 InstallDir "$PROGRAMFILES\VideoLAN\VLC"\r
+\r
 ; check if the program has already been installed, if so, take this dir\r
 ; as install dir\r
 InstallDirRegKey HKLM SOFTWARE\VideoLAN\VLC "Install_Dir"\r
@@ -46,7 +48,7 @@ SetDatablockOptimize on
 SetDateSave off\r
 SetCompress auto\r
 \r
-UninstallText "This will uninstall the VLC media player. Hit next to continue."\r
+UninstallText "This will uninstall the VLC media player."\r
 \r
 ;;;;;;;;;;;;;;;;;;;;\r
 ; Install settings ;\r
@@ -61,11 +63,22 @@ Section "Install"
        File  /r share\r
        File  /r plugins\r
        File  /r locale\r
+       File  /r skins\r
 \r
        CreateDirectory "$SMPROGRAMS\VideoLAN"\r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" "$INSTDIR\vlc.exe" \r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\FAQ.lnk" "$INSTDIR\faq.htm"\r
-       CreateShortCut "$SMPROGRAMS\VideoLAN\Uninstall VLC.lnk" "$INSTDIR\uninstall.exe"\r
+       CreateShortCut "$SMPROGRAMS\VideoLAN\vlc.lnk" \\r
+                       "$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
+        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
@@ -79,16 +92,9 @@ SectionEnd
 ;;;;;;;;;;;;;;;;;;;;;;\r
 \r
 Section "Uninstall"\r
-       Delete $SMPROGRAMS\VideoLAN\*\r
-       RMDir $SMPROGRAMS\VideoLAN\r
-       Delete $INSTDIR\share\*\r
-       RMDir $INSTDIR\share\r
-       Delete $INSTDIR\plugins\*\r
-       RMDir $INSTDIR\plugins\r
-       Delete $INSTDIR\locale\*\r
-       RMDir $INSTDIR\locale\r
-       Delete $INSTDIR\*\r
-       RMDir $INSTDIR\r
+       RMDir /r $SMPROGRAMS\VideoLAN\r
+       RMDir /r $INSTDIR\r
        DeleteRegKey HKLM SOFTWARE\VideoLAN\r
+        DeleteRegKey HKLM \\r
+            Software\Microsoft\Windows\CurrentVersion\Uninstall\VideoLAN\r
 SectionEnd\r
-\r