Add manifests to browser plugins

diff --git a/Makefile.am b/Makefile.am
index 990a879bdde44546abcc9a0600c5ec06f1dd2d03..77a0d352c04f7bc20a9c7732f8eab97f6f59d2fb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -725,6 +725,7 @@ package-win-common:
 if BUILD_MOZILLA
        mkdir -p "$(win32_destdir)/mozilla"
        cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/
+       cp $(top_builddir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
 endif
 
 # ActiveX plugin
@@ -735,6 +736,7 @@ if BUILD_ACTIVEX
        unix2dos $(win32_destdir)/activex/*
 
        cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
+       cp $(top_builddir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
 endif
 
 # Rebase all those DLLs to speed up loading (need cygwin rebase)

diff --git a/projects/activex/axvlc.dll.manifest b/projects/activex/axvlc.dll.manifest
new file mode 100755 (executable)
index 0000000..9f7acaf
--- /dev/null
+++ b/projects/activex/axvlc.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="axvlc.dll"
+               type="win32"
+       />
+       <description>VLC ActiveX plugin</description>
+       <dependency>
+               <dependentAssembly>
+                       <assemblyIdentity
+                               type="win32"
+                               name="Microsoft-Windows-MSVCRT20"
+                               version="6.0.6000.16386"
+                               processorArchitecture="x86"
+                               publicKeyToken="31bf3856ad364e35"
+                               language="*"
+                       />
+               </dependentAssembly>
+       </dependency>
+</assembly>

diff --git a/projects/mozilla/npvlc.dll.manifest b/projects/mozilla/npvlc.dll.manifest
new file mode 100755 (executable)
index 0000000..a0935f0
--- /dev/null
+++ b/projects/mozilla/npvlc.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="npvlc.dll"
+               type="win32"
+       />
+       <description>VLC Mozilla plugin</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