[vlc-devel] commit: specify dependency to msvcrt for vlc.exe and libvlc.dll ( Geoffroy Couprie )

[git version control]

vlc | branch: 0.9-bugfix | Geoffroy Couprie <geo.couprie at gmail.com> | Mon Nov 24 23:06:47 2008 +0100| [311f28a1e4791e901df6fd911d80332d538e618d] | committer: Jean-Baptiste Kempf 

specify dependency to msvcrt for vlc.exe and libvlc.dll
(cherry picked from commit e45586d00e21d212bfad4dc5579283d00e27e3b5)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=311f28a1e4791e901df6fd911d80332d538e618d
---

 Makefile.am                              |    2 +
 extras/package/win32/libvlc.dll.manifest |   22 ++++++++++++
 extras/package/win32/vlc.exe.manifest    |   56 ++++++++++++++++++------------
 3 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 152ea34..b92b61b 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 \
@@ -691,6 +692,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 0000000..eac4ee6
--- /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 51907ff..d5f3ba8 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>