Don't build/package mozilla plugin for win64

npapi hasn't been ported to windows 64 yet

diff --git a/Makefile.am b/Makefile.am
index 56fe4aacf29f2d78dff4fb79c7c09f3934e75fc9..caf3d71de604ac773d7167bb95c1d04e678e0f62 100644 (file)
--- 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)/" \;
 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"
        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
        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
        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
 
 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
        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
 
 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)/"
        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"
        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 d227aa36d8cfd265976adc3bc2d2bf6523e2e8a1..6c8a5623752523db77568a86d0f508696bb13693 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -156,6 +156,7 @@ LDFLAGS_vlc="${LDFLAGS}"
 dnl
 dnl  Check the operating system
 dnl
 dnl
 dnl  Check the operating system
 dnl

+HAVE_WIN64="0"

 case "${host_os}" in
   "")
     SYS=unknown
 case "${host_os}" in
   "")
     SYS=unknown


@@ -329,10 +330,11 @@ case "${host_os}" in
         DESTDIR="`pwd`/_win32/"
 
         dnl
         DESTDIR="`pwd`/_win32/"
 
         dnl

-        dnl NSIS Installer prefix
+        dnl NSIS Installer prefix and WIN64

         dnl
         case "${host}" in
             amd64*|i686-w64*|x86_64*)
         dnl
         case "${host}" in
             amd64*|i686-w64*|x86_64*)

+                HAVE_WIN64="1"

                 PROGRAMFILES="PROGRAMFILES64"
             ;;
             *)
                 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_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"])
 
 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 8245670da06a83c1a667973907aa3bf3e643b949..d8600e8d51ac2cbda8ffd8ff1453e864598ff77d 100644 (file)
--- a/extras/package/npapi.am
+++ b/extras/package/npapi.am
@@ -1,6 +1,11 @@
 #! /usr/bin/make -f
 
 #! /usr/bin/make -f
 

+if HAVE_WIN64
+build-npapi:
+       touch $@
+else

 build-npapi: stamp-npapi-build
 build-npapi: stamp-npapi-build

+endif

 
 stamp-npapi-fetch:
        rm -Rf npapi-vlc
 
 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 bc393fbfab4a8e3b05acf2de62eb6edcaa781d13..4efd7f72edbc980b1a9b270b18caa0ad6c875e49 100644 (file)
--- 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
 !define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
 
 @BUILD_ACTIVEX_TRUE@ !define INSTALL_ACTIVEX

+@HAVE_WIN64_FALSE@ !define INSTALL_MOZILLA

 
 @FILE_LIBVLCCORE_DLL@
 @FILE_LIBVLC_DLL@
 
 @FILE_LIBVLCCORE_DLL@
 @FILE_LIBVLC_DLL@


@@ -600,6 +601,7 @@ Section $Name_Section02b SEC02b
     "$INSTDIR\vlc.exe" ""
 SectionEnd
 
     "$INSTDIR\vlc.exe" ""
 SectionEnd
 

+!ifdef INSTALL_MOZILLA

 Section /o $Name_Section03 SEC03
   SectionIn 3
 
 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
   WriteRegStr HKLM ${Moz} "Vendor" "VideoLAN"
   WriteRegStr HKLM ${Moz} "Version" "${VERSION}"
 SectionEnd

+!endif

 
 !ifdef INSTALL_ACTIVEX
 Section $Name_Section04 SEC04
 
 !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
   !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
   !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
 @BUILD_ACTIVEX_TRUE@ !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $Desc_Section04
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} $Desc_Section05
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} $Desc_Section06