Commit 311f28a1 authored by Geoffroy Couprie's avatar Geoffroy Couprie Committed by Jean-Baptiste Kempf

specify dependency to msvcrt for vlc.exe and libvlc.dll

(cherry picked from commit e45586d0)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent d954581a
...@@ -36,6 +36,7 @@ EXTRA_DIST = \ ...@@ -36,6 +36,7 @@ EXTRA_DIST = \
INSTALL.win32 \ INSTALL.win32 \
INSTALL.wince \ INSTALL.wince \
extras/package/win32/vlc.exe.manifest \ extras/package/win32/vlc.exe.manifest \
extras/package/win32/libvlc.dll.manifest \
MAINTAINERS \ MAINTAINERS \
extras/package/macosx/README.MacOSX.rtf \ extras/package/macosx/README.MacOSX.rtf \
vlc-config.in.in \ vlc-config.in.in \
...@@ -691,6 +692,7 @@ package-win-common: ...@@ -691,6 +692,7 @@ package-win-common:
# Copy executables and libs # Copy executables and libs
cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/" 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/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/libvlccore$(LIBEXT)" "$(win32_destdir)/"
cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/" cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/"
......
<?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
...@@ -19,4 +19,16 @@ ...@@ -19,4 +19,16 @@
/> />
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft-Windows-MSVCRT20"
version="6.0.6000.16386"
processorArchitecture="x86"
publicKeyToken="31bf3856ad364e35"
language="*"
/>
</dependentAssembly>
</dependency>
</assembly> </assembly>
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