Skip to content

GitLab

Commit e45586d0 authored by Geoffroy Couprie's avatar Geoffroy Couprie
Browse files
Options

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

parent 77c9a1f2
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 22 deletions
Makefile.am
View file @ e45586d0
......@@ -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)/"
......
extras/package/win32/libvlc.dll.manifest 0 → 100755
View file @ e45586d0
<?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
extras/package/win32/vlc.exe.manifest
View file @ e45586d0
<?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>
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