]> git.sesse.net Git - vlc/commitdiff
win packaging: disable activex on win64
authorRafaël Carré <funman@videolan.org>
Tue, 8 Nov 2011 01:21:31 +0000 (20:21 -0500)
committerRafaël Carré <funman@videolan.org>
Tue, 8 Nov 2011 01:21:31 +0000 (20:21 -0500)
extras/package/npapi.am

index 2e032988d84c4bee2e006d4a90ffd1bd88ef8751..4755df30b5a5732628250c86c47ae0460fcd6b84 100644 (file)
@@ -13,12 +13,19 @@ 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
        cd npapi-vlc && \
        $(SHELL) ./configure \
                --prefix=/ \
                --host=$(host_alias) --build=$(build_alias) \
                --with-mozilla-sdk-path="$(CONTRIB_DIR)/gecko-sdk" \
+               $(CONF_ACTIVEX) \
                CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" \
                CC="$(CC)" CFLAGS="$(CFLAGS)" \
                CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \