vlc | branch: master | Rafaël Carré <[email protected]> | Mon Oct 18 15:10:04 2010 +0200| [698853e41d9689751ae298f2a1bf16264ac94c40] | committer: Rafaël Carré
Don't build/package mozilla plugin for win64 npapi hasn't been ported to windows 64 yet > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=698853e41d9689751ae298f2a1bf16264ac94c40 --- Makefile.am | 8 ++++++++ configure.ac | 5 ++++- extras/package/npapi.am | 5 +++++ extras/package/win32/vlc.win32.nsi.in | 5 +++++ 4 files changed, 22 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 56fe4aa..caf3d71 100644 --- a/Makefile.am +++ b/Makefile.am @@ -832,25 +832,33 @@ package-win-base: package-win-common package-win32-webplugin-common: package-win-base build-npapi mkdir -p "$(win32_xpi_destdir)/plugins" find $(destdir) -maxdepth 4 -name "*$(LIBEXT)" -exec cp {} "$(win32_xpi_destdir)/" \; +if !HAVE_WIN64 cp $(top_srcdir)/npapi-vlc/src/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 build-npapi +if !HAVE_WIN64 cp $(top_builddir)/npapi-vlc/src/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 build-npapi +if !HAVE_WIN64 cp $(top_builddir)/npapi-vlc/src/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 build-npapi # Script installer +if !HAVE_WIN64 cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/" cp "$(top_builddir)/npapi-vlc/src/npvlc.dll.manifest" "$(win32_destdir)/" +endif cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/" cp "$(top_builddir)/extras/package/win32/spad.nsi" "$(win32_destdir)/" mkdir "$(win32_destdir)/languages" diff --git a/configure.ac b/configure.ac index d227aa3..6c8a562 100644 --- a/configure.ac +++ b/configure.ac @@ -156,6 +156,7 @@ LDFLAGS_vlc="${LDFLAGS}" dnl dnl Check the operating system dnl +HAVE_WIN64="0" case "${host_os}" in "") SYS=unknown @@ -329,10 +330,11 @@ case "${host_os}" in DESTDIR="`pwd`/_win32/" dnl - dnl NSIS Installer prefix + dnl NSIS Installer prefix and WIN64 dnl case "${host}" in amd64*|i686-w64*|x86_64*) + HAVE_WIN64="1" PROGRAMFILES="PROGRAMFILES64" ;; *) @@ -384,6 +386,7 @@ AM_CONDITIONAL(HAVE_BEOS, test "${SYS}" = "beos") AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin") AM_CONDITIONAL(HAVE_LINUX, [test "${SYS}" = "linux"]) AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") +AM_CONDITIONAL(HAVE_WIN64, test "${HAVE_WIN64}" = "1") AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce") AM_CONDITIONAL(USE_PEFLAGS, [test "${enable_peflags}" = "yes"]) diff --git a/extras/package/npapi.am b/extras/package/npapi.am index 8245670..d8600e8 100644 --- a/extras/package/npapi.am +++ b/extras/package/npapi.am @@ -1,6 +1,11 @@ #! /usr/bin/make -f +if HAVE_WIN64 +build-npapi: + touch $@ +else build-npapi: stamp-npapi-build +endif stamp-npapi-fetch: rm -Rf npapi-vlc diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in index bc393fb..4efd7f7 100644 --- a/extras/package/win32/vlc.win32.nsi.in +++ b/extras/package/win32/vlc.win32.nsi.in @@ -21,6 +21,7 @@ !define MUI_LANGDLL_REGISTRY_VALUENAME "Language" @BUILD_ACTIVEX_TRUE@ !define INSTALL_ACTIVEX +...@have_win64_false@ !define INSTALL_MOZILLA @FILE_LIBVLCCORE_DLL@ @FILE_LIBVLC_DLL@ @@ -600,6 +601,7 @@ Section $Name_Section02b SEC02b "$INSTDIR\vlc.exe" "" SectionEnd +!ifdef INSTALL_MOZILLA Section /o $Name_Section03 SEC03 SectionIn 3 @@ -616,6 +618,7 @@ Section /o $Name_Section03 SEC03 WriteRegStr HKLM ${Moz} "Vendor" "VideoLAN" WriteRegStr HKLM ${Moz} "Version" "${VERSION}" SectionEnd +!endif !ifdef INSTALL_ACTIVEX Section $Name_Section04 SEC04 @@ -750,7 +753,9 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} $Desc_Section01 !insertmacro MUI_DESCRIPTION_TEXT ${SEC02a} $Desc_Section02a !insertmacro MUI_DESCRIPTION_TEXT ${SEC02b} $Desc_Section02b +!ifdef INSTALL_MOZILLA !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $Desc_Section03 +!endif @BUILD_ACTIVEX_TRUE@ !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $Desc_Section04 !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} $Desc_Section05 !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} $Desc_Section06 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
