vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon Dec 15 16:49:01 2014 +0100| [2cffc6826f7114e7b494d455bc006cf631240149] | committer: Jean-Baptiste Kempf
Win32: don't build NPAPI in package-win-common Many people don't care about NPAPI and it's hard to build (cherry picked from commit 969a8451cc02885a0fb411da1216667f2f38a302) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=2cffc6826f7114e7b494d455bc006cf631240149 --- extras/package/win32/package.mak | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak index 2da6f1f..e246ce2 100644 --- a/extras/package/win32/package.mak +++ b/extras/package/win32/package.mak @@ -26,8 +26,7 @@ package-win-install: $(MAKE) install touch $@ - -package-win-common: package-win-install build-npapi +package-win-common: package-win-install mkdir -p "$(win32_destdir)"/ # Executables, major libs+manifests @@ -59,11 +58,6 @@ if BUILD_SKINS cp -r $(prefix)/share/vlc/skins2 $(win32_destdir)/skins endif - cp "$(top_builddir)/npapi-vlc/activex/axvlc.dll.manifest" "$(win32_destdir)/" - cp "$(top_builddir)/npapi-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/" - cp "$(top_builddir)/npapi-vlc/npapi/package/npvlc.dll.manifest" "$(win32_destdir)/" - cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/" - # Compiler shared DLLs, when using compilers built with --enable-shared # The shared DLLs may not necessarily be in the first LIBRARY_PATH, we # should check them all. @@ -90,17 +84,21 @@ endif $(DLLTOOL) -D libvlccore.dll -l "$(win32_destdir)/sdk/lib/libvlccore.lib" -d "$(top_builddir)/src/.libs/libvlccore.dll.def" "$(prefix)/bin/libvlccore.dll" echo "INPUT(libvlccore.lib)" > "$(win32_destdir)/sdk/lib/vlccore.lib" - mkdir -p "$(win32_destdir)/sdk/activex/" - cd $(top_builddir)/npapi-vlc && cp activex/README.TXT share/test/test.html $(win32_destdir)/sdk/activex/ - # Convert to DOS line endings find $(win32_destdir) -type f \( -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*.lua' \) -exec $(U2D) {} \; # Remove cruft find $(win32_destdir)/plugins/ -type f \( -name '*.a' -or -name '*.la' \) -exec rm -rvf {} \; +package-win-npapi: build-npapi + cp "$(top_builddir)/npapi-vlc/activex/axvlc.dll.manifest" "$(win32_destdir)/" + cp "$(top_builddir)/npapi-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/" + cp "$(top_builddir)/npapi-vlc/npapi/package/npvlc.dll.manifest" "$(win32_destdir)/" + cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/" + mkdir -p "$(win32_destdir)/sdk/activex/" + cd $(top_builddir)/npapi-vlc && cp activex/README.TXT share/test/test.html $(win32_destdir)/sdk/activex/ -package-win-strip: package-win-common +package-win-strip: package-win-common package-win-npapi mkdir -p "$(win32_debugdir)"/ cd $(win32_destdir); find . -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \ do if test -n "$$i" ; then \ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
