specify dependency to msvcrt for vlc.exe and libvlc.dll
authorGeoffroy Couprie <geo.couprie@gmail.com>
Mon, 24 Nov 2008 22:06:47 +0000 (23:06 +0100)
committerGeoffroy Couprie <geo.couprie@gmail.com>
Mon, 24 Nov 2008 22:07:47 +0000 (23:07 +0100)
Makefile.am
extras/package/win32/libvlc.dll.manifest [new file with mode: 0755]
extras/package/win32/vlc.exe.manifest

index 77a0d35..cdc34db 100644 (file)
@@ -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 (executable)
index 0000000..eac4ee6
--- /dev/null
@@ -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
index 51907ff..d5f3ba8 100644 (file)
@@ -1,22 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">\r
-       <assemblyIdentity\r
-               version="1.0.0.0"\r
-               processorArchitecture="X86"\r
-               name="VideoLAN.VLC"\r
-               type="win32"\r
-       />\r
-       <description>see http://www.videolan.org/</description>\r
-       <dependency>\r
-               <dependentAssembly>\r
-                       <assemblyIdentity\r
-                               type="win32"\r
-                               name="Microsoft.Windows.Common-Controls"\r
-                               version="6.0.0.0"\r
-                               processorArchitecture="X86"\r
-                               publicKeyToken="6595b64144ccf1df"\r
-                               language="*"\r
-                       />\r
-               </dependentAssembly>\r
-       </dependency>\r
-</assembly>\r
+<?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>