Skip to content

V
vlc
Commit 2b8b58df authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Merge branch '0.9-bugfix' of git@git.videolan.org:vlc into 0.9-bugfix

parents ab3e5dc6 abacfd86
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
Makefile.am
View file @ 2b8b58df
...@@ -721,7 +721,7 @@ package-win-common: ...@@ -721,7 +721,7 @@ package-win-common:
if BUILD_MOZILLA if BUILD_MOZILLA
mkdir -p "$(win32_destdir)/mozilla" mkdir -p "$(win32_destdir)/mozilla"
cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(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/ cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
endif endif
# ActiveX plugin # ActiveX plugin
...@@ -732,7 +732,7 @@ if BUILD_ACTIVEX ...@@ -732,7 +732,7 @@ if BUILD_ACTIVEX
unix2dos $(win32_destdir)/activex/* unix2dos $(win32_destdir)/activex/*
cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(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/ cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
endif endif
# Rebase all those DLLs to speed up loading (need cygwin rebase) # Rebase all those DLLs to speed up loading (need cygwin rebase)
......
extras/package/win32/libvlc.dll.manifest
View file @ 2b8b58df
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
<dependentAssembly> <dependentAssembly>
<assemblyIdentity <assemblyIdentity
type="win32" type="win32"
name="Microsoft-Windows-MSVCRT20" name="Microsoft.VC80.CRT"
version="6.0.6000.16386" version="8.0.41204.256"
processorArchitecture="x86" processorArchitecture="x86"
publicKeyToken="31bf3856ad364e35" publicKeyToken="1fc8b3b9a1e18e3b"
language="*" language="neutral"
/> />
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
......
extras/package/win32/vlc.exe.manifest
View file @ 2b8b58df
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
<dependentAssembly> <dependentAssembly>
<assemblyIdentity <assemblyIdentity
type="win32" type="win32"
name="Microsoft-Windows-MSVCRT20" name="Microsoft.VC80.CRT"
version="6.0.6000.16386" version="8.0.41204.256"
processorArchitecture="x86" processorArchitecture="x86"
publicKeyToken="31bf3856ad364e35" publicKeyToken="1fc8b3b9a1e18e3b"
language="*" language="neutral"
/> />
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
......
projects/activex/axvlc.dll.manifest
View file @ 2b8b58df
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
<dependentAssembly> <dependentAssembly>
<assemblyIdentity <assemblyIdentity
type="win32" type="win32"
name="Microsoft-Windows-MSVCRT20" name="Microsoft.VC80.CRT"
version="6.0.6000.16386" version="8.0.41204.256"
processorArchitecture="x86" processorArchitecture="x86"
publicKeyToken="31bf3856ad364e35" publicKeyToken="1fc8b3b9a1e18e3b"
language="*" language="neutral"
/> />
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
......
projects/mozilla/npvlc.dll.manifest
View file @ 2b8b58df
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
<dependentAssembly> <dependentAssembly>
<assemblyIdentity <assemblyIdentity
type="win32" type="win32"
name="Microsoft-Windows-MSVCRT20" name="Microsoft.VC80.CRT"
version="6.0.6000.16386" version="8.0.41204.256"
processorArchitecture="x86" processorArchitecture="x86"
publicKeyToken="31bf3856ad364e35" publicKeyToken="1fc8b3b9a1e18e3b"
language="*" language="neutral"
/> />
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
......
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