Revert "Do not try to build the ActiveX so we can at least have nightlies."
authorJean-Paul Saman <jpsaman@videolan.org>
Sun, 8 Jun 2008 17:51:57 +0000 (19:51 +0200)
committerJean-Paul Saman <jpsaman@videolan.org>
Sat, 14 Jun 2008 08:09:05 +0000 (10:09 +0200)
This reverts commit 097f8fc9cddf85baac0ad3083c13a85384e86e66.

Makefile.am

index 66dbb51..c53f982 100644 (file)
@@ -25,7 +25,7 @@ if BUILD_MOZILLA
 SUBDIRS += projects/mozilla
 endif
 if BUILD_ACTIVEX
-#FIXME:SUBDIRS += projects/activex
+SUBDIRS += projects/activex
 endif
 
 EXTRA_DIST = \
@@ -707,7 +707,7 @@ if BUILD_ACTIVEX
        cp $(srcdir)/projects/activex/test.html  $(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
 
 # Rebase all those DLLs to speed up loading (need cygwin rebase)
@@ -850,7 +850,7 @@ if BUILD_MOZILLA
        $(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT);
 endif
 if BUILD_ACTIVEX
-#FIXME $(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT);
+       $(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT);
 endif
 
 package-win32-base: package-win32-base-debug package-win-common-strip