libvlc.h: compile fix (s/_N/N_/)

[vlc] / vlc.win32.nsi

diff --git a/vlc.win32.nsi b/vlc.win32.nsi
index 9fbd020bd25ce846962c1620ec683d68891c204f..1be9b9bede8bba5ee07e1939a05935403962815e 100644 (file)
--- a/vlc.win32.nsi
+++ b/vlc.win32.nsi
@@ -39,8 +39,8 @@ InstType "Full"
 \r
 ; MUI Settings\r
 !define MUI_ABORTWARNING\r
-!define MUI_ICON "vlc48x48.ico"\r
-!define MUI_UNICON "vlc48x48.ico"\r
+!define MUI_ICON "vlc48x48new.ico"\r
+!define MUI_UNICON "vlc48x48new.ico"\r
 !define MUI_COMPONENTSPAGE_SMALLDESC\r
 \r
 ; Welcome page\r
@@ -190,8 +190,12 @@ Section "Start Menu + Desktop Shortcut" SEC02
     "$INSTDIR\vlc.exe" "--intf wxwin"\r
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" \\r
     "${PRODUCT_WEB_SITE}"\r
-  CreateShortCut "$SMPROGRAMS\VideoLAN\Website.lnk" \\r
+  CreateShortCut "$SMPROGRAMS\VideoLAN\${PRODUCT_NAME} Website.lnk" \\r
     "$INSTDIR\${PRODUCT_NAME}.url"\r
+  WriteIniStr "$INSTDIR\Documentation.url" "InternetShortcut" "URL" \\r
+    "${PRODUCT_WEB_SITE}/doc/"\r
+  CreateShortCut "$SMPROGRAMS\VideoLAN\Documentation.lnk" \\r
+    "$INSTDIR\Documentation.url"\r
 SectionEnd\r
 \r
 Section /o "Mozilla plugin" SEC03\r
@@ -240,43 +244,51 @@ Section /o "ActiveX plugin" SEC04
 SectionEnd\r
 \r
 SubSection "File type associations" SEC05\r
-  ; Make sure we have the same list in uninstall\r
-  !insertmacro RegisterExtensionSection ".a52"\r
-  !insertmacro RegisterExtensionSection ".aac"\r
-  !insertmacro RegisterExtensionSection ".ac3"\r
-  !insertmacro RegisterExtensionSection ".asf"\r
-  !insertmacro RegisterExtensionSection ".asx"\r
-  !insertmacro RegisterExtensionSection ".avi"\r
-  !insertmacro RegisterExtensionSection ".bin"\r
-  !insertmacro RegisterExtensionSection ".cue"\r
-  !insertmacro RegisterExtensionSection ".divx"\r
-  !insertmacro RegisterExtensionSection ".dts"\r
-  !insertmacro RegisterExtensionSection ".dv"\r
-  !insertmacro RegisterExtensionSection ".flac"\r
-  !insertmacro RegisterExtensionSection ".m1v"\r
-  !insertmacro RegisterExtensionSection ".m2v"\r
-  !insertmacro RegisterExtensionSection ".m3u"\r
-  !insertmacro RegisterExtensionSection ".mka"\r
-  !insertmacro RegisterExtensionSection ".mkv"\r
-  !insertmacro RegisterExtensionSection ".mov"\r
-  !insertmacro RegisterExtensionSection ".mp1"\r
-  !insertmacro RegisterExtensionSection ".mp2"\r
-  !insertmacro RegisterExtensionSection ".mp3"\r
-  !insertmacro RegisterExtensionSection ".mp4"\r
-  !insertmacro RegisterExtensionSection ".mpeg"\r
-  !insertmacro RegisterExtensionSection ".mpeg1"\r
-  !insertmacro RegisterExtensionSection ".mpeg2"\r
-  !insertmacro RegisterExtensionSection ".mpeg4"\r
-  !insertmacro RegisterExtensionSection ".mpg"\r
-  !insertmacro RegisterExtensionSection ".ogg"\r
-  !insertmacro RegisterExtensionSection ".ogm"\r
-  !insertmacro RegisterExtensionSection ".pls"\r
-  !insertmacro RegisterExtensionSection ".spx"\r
-  !insertmacro RegisterExtensionSection ".vob"\r
-  !insertmacro RegisterExtensionSection ".vlc"\r
-  !insertmacro RegisterExtensionSection ".wav"\r
-  !insertmacro RegisterExtensionSection ".wma"\r
-  !insertmacro RegisterExtensionSection ".wmv"\r
+  SubSection "Audio Files"\r
+    ; Make sure we have the same list in uninstall\r
+    !insertmacro RegisterExtensionSection ".a52"\r
+    !insertmacro RegisterExtensionSection ".aac"\r
+    !insertmacro RegisterExtensionSection ".ac3"\r
+    !insertmacro RegisterExtensionSection ".dts"\r
+    !insertmacro RegisterExtensionSection ".flac"\r
+    !insertmacro RegisterExtensionSection ".mka"\r
+    !insertmacro RegisterExtensionSection ".mp1"\r
+    !insertmacro RegisterExtensionSection ".mp2"\r
+    !insertmacro RegisterExtensionSection ".mp3"\r
+    !insertmacro RegisterExtensionSection ".ogg"\r
+    !insertmacro RegisterExtensionSection ".spx"\r
+    !insertmacro RegisterExtensionSection ".wav"\r
+    !insertmacro RegisterExtensionSection ".wma"\r
+  SubSectionEnd\r
+  SubSection "Video Files"\r
+    ; Make sure we have the same list in uninstall\r
+    !insertmacro RegisterExtensionSection ".asf"\r
+    !insertmacro RegisterExtensionSection ".avi"\r
+    !insertmacro RegisterExtensionSection ".divx"\r
+    !insertmacro RegisterExtensionSection ".dv"\r
+    !insertmacro RegisterExtensionSection ".m1v"\r
+    !insertmacro RegisterExtensionSection ".m2v"\r
+    !insertmacro RegisterExtensionSection ".mkv"\r
+    !insertmacro RegisterExtensionSection ".mov"\r
+    !insertmacro RegisterExtensionSection ".mp4"\r
+    !insertmacro RegisterExtensionSection ".mpeg"\r
+    !insertmacro RegisterExtensionSection ".mpeg1"\r
+    !insertmacro RegisterExtensionSection ".mpeg2"\r
+    !insertmacro RegisterExtensionSection ".mpeg4"\r
+    !insertmacro RegisterExtensionSection ".mpg"\r
+    !insertmacro RegisterExtensionSection ".ogm"\r
+    !insertmacro RegisterExtensionSection ".vob"\r
+    !insertmacro RegisterExtensionSection ".wmv"\r
+  SubSectionEnd\r
+  SubSection "Other"\r
+    ; Make sure we have the same list in uninstall\r
+    !insertmacro RegisterExtensionSection ".asx"\r
+    !insertmacro RegisterExtensionSection ".bin"\r
+    !insertmacro RegisterExtensionSection ".cue"\r
+    !insertmacro RegisterExtensionSection ".m3u"\r
+    !insertmacro RegisterExtensionSection ".pls"\r
+    !insertmacro RegisterExtensionSection ".vlc"\r
+  SubSectionEnd\r
 SubSectionEnd\r
 \r
 Section -Post\r