Commit 61135774 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

win32: installers: Don't install manifests since they aren't packaged anymore

parent cc424bbe
......@@ -189,7 +189,6 @@ ${MementoSection} $Name_Section01 SEC01
; VLC.exe, libvlc.dll
!insertmacro InstallFile vlc.exe
!insertmacro InstallFile vlc.exe.manifest
!insertmacro InstallFile vlc-cache-gen.exe
; All dlls
......@@ -278,7 +277,6 @@ ${MementoSection} $Name_Section03 SEC03
SetOutPath "$INSTDIR"
!insertmacro OpenUninstallLog
!insertmacro InstallFile npvlc.dll
!insertmacro InstallFile npvlc.dll.manifest
!insertmacro CloseUninstallLog
!define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}"
......@@ -297,7 +295,6 @@ ${MementoSection} $Name_Section04 SEC04
SetOutPath "$INSTDIR"
!insertmacro OpenUninstallLog
!insertmacro InstallFile axvlc.dll
!insertmacro InstallFile axvlc.dll.manifest
!insertmacro CloseUninstallLog
@HAVE_WIN64_FALSE@ RegDLL "$INSTDIR\axvlc.dll"
@HAVE_WIN64_TRUE@ ExecWait 'regsvr32.exe /s "$INSTDIR\axvlc.dll"'
......@@ -909,7 +906,6 @@ Section "un.$Name_Section91" SEC91
@HAVE_WIN64_FALSE@ UnRegDLL "$INSTDIR\axvlc.dll"
@HAVE_WIN64_TRUE@ ExecWait 'regsvr32.exe /s /u "$INSTDIR\axvlc.dll"'
Delete /REBOOTOK "$INSTDIR\axvlc.dll"
Delete /REBOOTOK "$INSTDIR\axvlc.dll.manifest"
;remove mozilla plugin
Push $R0
......@@ -937,7 +933,6 @@ Section "un.$Name_Section91" SEC91
"${Index}-End:"
!undef Index
Delete /REBOOTOK "$INSTDIR\npvlc.dll"
Delete /REBOOTOK "$INSTDIR\npvlc.dll.manifest"
RMDir "$SMPROGRAMS\VideoLAN"
RMDir /r $SMPROGRAMS\VideoLAN
......
......@@ -84,7 +84,6 @@
<Component Id='CompVLC' Guid='$(var.CompVLCexe)' Win64="$(var.Win64)">
<File Id='vlc.exe' Name='vlc.exe' KeyPath='yes' Vital='yes' DiskId='1' />
<File Id='vlc.exe.manifest' Name='vlc.exe.manifest' DiskId='1' />
<Shortcut Id="DesktopShortcut"
Directory="DesktopFolder"
......@@ -124,17 +123,14 @@
<Component Id='CompLibvlc' Guid='50d7e1e1-4512-4020-9f7b-5dc8484574f3' Win64="$(var.Win64)">
<File Id='libvlc.dll' Name='libvlc.dll' KeyPath='yes' Vital='yes' DiskId='1' />
<File Id='libvlc.dll.manifest' Name='libvlc.dll.manifest' DiskId='1' />
</Component>
<Component Id='CompNpvlc' Guid='e7d6b54c-c4ea-4280-90f5-c6ae80073d25' Win64="$(var.Win64)">
<File Id='npvlc.dll' Name='npvlc.dll' KeyPath='yes' DiskId='1' />
<File Id='npvlc.dll.manifest' Name='npvlc.dll.manifest' DiskId='1' />
</Component>
<Component Id='CompAxvlc' Guid='cabe28b1-5586-4ac3-815b-4f3a834c0d54' Win64="$(var.Win64)">
<File Id='axvlc.dll' Name='axvlc.dll' KeyPath='yes' DiskId='1' />
<File Id='axvlc.dll.manifest' Name='axvlc.dll.manifest' DiskId='1' />
</Component>
<Component Id='CompCacheGen' Guid='e1b4a499-e223-4c18-9de0-258f12b8dcfa' Win64="$(var.Win64)">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment