[vlc-commits] win64: build and ship activex plugin

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Mon Mar 26 19:00:44 2012 -0400| [28cb395de530759b5b5ee2dc39dbfe9be1d6844f] | committer: Jean-Baptiste Kempf

win64: build and ship activex plugin
(cherry picked from commit fbbc06244c23e5af97409390115c5a42d1dbfb5d)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=28cb395de530759b5b5ee2dc39dbfe9be1d6844f
---

 extras/package/npapi.am               |    7 -------
 extras/package/win32/package.mak      |    4 ----
 extras/package/win32/vlc.win32.nsi.in |    2 +-
 3 files changed, 1 insertions(+), 12 deletions(-)

diff --git a/extras/package/npapi.am b/extras/package/npapi.am
index 8bde4c4..6c7bfcd 100644
--- a/extras/package/npapi.am
+++ b/extras/package/npapi.am
@@ -17,18 +17,11 @@ stamp-npapi-autogen: stamp-npapi-fetch
 	$(SHELL) ./autogen.sh
 	touch $@
 
-if HAVE_WIN64
-CONF_ACTIVEX = --disable-activex
-else
-CONF_ACTIVEX =
-endif
-
 stamp-npapi-configure: stamp-npapi-autogen stamp-gecko-fetch
 	cd npapi-vlc && \
 	$(SHELL) ./configure \
 		--prefix=/ \
 		--host=$(host_alias) --build=$(build_alias) \
-		$(CONF_ACTIVEX) \
 		CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" \
 		CC="$(CC)" CFLAGS="$(CFLAGS)" \
 		CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index abf0bb1..33aad95 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -68,10 +68,8 @@ if BUILD_OSDMENU
 endif
 
 if !HAVE_WINCE
-if !HAVE_WIN64
 	cp "$(top_builddir)/npapi-vlc/activex/axvlc.dll.manifest" "$(win32_destdir)/"
 	cp "$(top_builddir)/npapi-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
@@ -90,11 +88,9 @@ if !HAVE_WINCE
 	$(DLLTOOL) -D libvlc.dll -l "$(win32_destdir)/sdk/lib/libvlc.lib" -d "$(top_builddir)/lib/.libs/libvlc.dll.def" "$(prefix)/bin/libvlc.dll"
 	$(DLLTOOL) -D libvlccore.dll -l "$(win32_destdir)/sdk/lib/libvlccore.lib" -d "$(top_builddir)/src/.libs/libvlccore.dll.def" "$(prefix)/bin/libvlccore.dll"
 
-if !HAVE_WIN64
 	mkdir -p "$(win32_destdir)/sdk/activex/"
 	cd $(top_builddir)/npapi-vlc && cp activex/README.TXT share/test.html $(win32_destdir)/sdk/activex/
 endif
-endif
 
 # 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) {} \;
diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index 66e8727..629ee0a 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -20,7 +20,7 @@
 !define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_DIR_REGKEY}"
 !define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
 
- at HAVE_WIN64_FALSE@ !define INSTALL_ACTIVEX
+!define INSTALL_ACTIVEX
 !define INSTALL_MOZILLA
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;