Skip to content

V
vlc
Commit 1fda54e9 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Revert "Do not try to build the ActiveX so we can at least have nightlies." 

This reverts commit 097f8fc9.
parent 15a5a372
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Makefile.am
View file @ 1fda54e9
...@@ -25,7 +25,7 @@ if BUILD_MOZILLA ...@@ -25,7 +25,7 @@ if BUILD_MOZILLA
SUBDIRS += projects/mozilla SUBDIRS += projects/mozilla
endif endif
if BUILD_ACTIVEX if BUILD_ACTIVEX
#FIXME:SUBDIRS += projects/activex SUBDIRS += projects/activex
endif endif
EXTRA_DIST = \ EXTRA_DIST = \
...@@ -707,7 +707,7 @@ if BUILD_ACTIVEX ...@@ -707,7 +707,7 @@ if BUILD_ACTIVEX
cp $(srcdir)/projects/activex/test.html $(top_builddir)/vlc-$(VERSION)/activex/ cp $(srcdir)/projects/activex/test.html $(top_builddir)/vlc-$(VERSION)/activex/
unix2dos $(top_builddir)/vlc-$(VERSION)/activex/* unix2dos $(top_builddir)/vlc-$(VERSION)/activex/*
#FIXME cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/
endif endif
# Rebase all those DLLs to speed up loading (need cygwin rebase) # Rebase all those DLLs to speed up loading (need cygwin rebase)
...@@ -850,7 +850,7 @@ if BUILD_MOZILLA ...@@ -850,7 +850,7 @@ if BUILD_MOZILLA
$(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT); $(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT);
endif endif
if BUILD_ACTIVEX if BUILD_ACTIVEX
#FIXME $(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT); $(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT);
endif endif
package-win32-base: package-win32-base-debug package-win-common-strip package-win32-base: package-win32-base-debug package-win-common-strip
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment