diff --git a/Makefile.am b/Makefile.am index 77a0d352c04f7bc20a9c7732f8eab97f6f59d2fb..cdc34dbdb8d1617c37200e4023530adac7946cc6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -36,6 +36,7 @@ EXTRA_DIST = \ INSTALL.win32 \ INSTALL.wince \ extras/package/win32/vlc.exe.manifest \ + extras/package/win32/libvlc.dll.manifest \ MAINTAINERS \ extras/package/macosx/README.MacOSX.rtf \ vlc-config.in.in \ @@ -697,6 +698,7 @@ package-win-common: # Copy executables and libs cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/" cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/" + cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_destdir)/" cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/" cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/" diff --git a/extras/package/win32/libvlc.dll.manifest b/extras/package/win32/libvlc.dll.manifest new file mode 100755 index 0000000000000000000000000000000000000000..eac4ee68ea35536745ca3c77f309affe44cdbdb6 --- /dev/null +++ b/extras/package/win32/libvlc.dll.manifest @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="x86" + name="libvlc.dll" + type="win32" + /> + <description>LibVLC</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft-Windows-MSVCRT20" + version="6.0.6000.16386" + processorArchitecture="x86" + publicKeyToken="31bf3856ad364e35" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly> \ No newline at end of file diff --git a/extras/package/win32/vlc.exe.manifest b/extras/package/win32/vlc.exe.manifest index 51907ff469bf6123b7cb9624997a5dbd0549a2b7..d5f3ba8d212fa3a9fe6b6c353dd6148e6d30373c 100644 --- a/extras/package/win32/vlc.exe.manifest +++ b/extras/package/win32/vlc.exe.manifest @@ -1,22 +1,34 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> - <assemblyIdentity - version="1.0.0.0" - processorArchitecture="X86" - name="VideoLAN.VLC" - type="win32" - /> - <description>see http://www.videolan.org/</description> - <dependency> - <dependentAssembly> - <assemblyIdentity - type="win32" - name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" - processorArchitecture="X86" - publicKeyToken="6595b64144ccf1df" - language="*" - /> - </dependentAssembly> - </dependency> -</assembly> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="1.0.0.0" + processorArchitecture="X86" + name="VideoLAN.VLC" + type="win32" + /> + <description>see http://www.videolan.org/</description> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="X86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> + </dependency> + <dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft-Windows-MSVCRT20" + version="6.0.6000.16386" + processorArchitecture="x86" + publicKeyToken="31bf3856ad364e35" + language="*" + /> + </dependentAssembly> + </dependency> +</assembly>