vlc | branch: master | Rafaël Carré <[email protected]> | Mon Nov 7 16:37:14 2011 -0500| [df287db5af3e35093216e504ee2fda150e43904f] | committer: Rafaël Carré
win64: really package npapi plugin > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=df287db5af3e35093216e504ee2fda150e43904f --- Makefile.am | 11 +++-------- extras/package/win32/vlc.win32.nsi.in | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1ba4cf0..17bcc93 100644 --- a/Makefile.am +++ b/Makefile.am @@ -739,14 +739,15 @@ if BUILD_OSDMENU rm -f -- "$$file.tmp"; \ done endif -if !HAVE_WIN64 + if !HAVE_WINCE +if !HAVE_WIN64 cp "$(top_builddir)/activex-vlc/src/axvlc.dll.manifest" "$(win32_destdir)/" cp "$(top_builddir)/activex-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/" +endif cp "$(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest" "$(win32_destdir)/" cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/" endif -endif # Compiler shared DLLs # For win64 only, Debian mingw32 compilers are built with --disable-shared @@ -789,26 +790,20 @@ package-win-base: package-win-common package-win32-webplugin-common: package-win-base mkdir -p "$(win32_xpi_destdir)/plugins" find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \; -if !HAVE_WIN64 cp $(top_builddir)/npapi-vlc/npapi/npvlc.dll.manifest "$(win32_xpi_destdir)/plugins" -endif cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_xpi_destdir)/plugins" cp -r $(win32_destdir)/plugins/ "$(win32_xpi_destdir)/plugins" rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*" rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*" package-win32-xpi: package-win32-webplugin-common -if !HAVE_WIN64 cp $(top_builddir)/npapi-vlc/npapi/install.rdf "$(win32_xpi_destdir)" cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" install.rdf plugins -endif package-win32-crx: package-win32-webplugin-common -if !HAVE_WIN64 cp $(top_builddir)/npapi-vlc/npapi/manifest.json "$(win32_xpi_destdir)" crxmake --pack-extension "$(win32_xpi_destdir)" \ --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" --ignore-file install.rdf -endif package-win32-base-exe: package-win-base # Script installer diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in index 364b153..2f39887 100644 --- a/extras/package/win32/vlc.win32.nsi.in +++ b/extras/package/win32/vlc.win32.nsi.in @@ -21,7 +21,7 @@ !define MUI_LANGDLL_REGISTRY_VALUENAME "Language" @HAVE_WIN64_FALSE@ !define INSTALL_ACTIVEX -@HAVE_WIN64_FALSE@ !define INSTALL_MOZILLA +!define INSTALL_MOZILLA @FILE_LIBVLCCORE_DLL@ @FILE_LIBVLC_DLL@ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
