]> git.sesse.net Git - vlc/blobdiff - extras/package/npapi.am
Win32: Check for the shared libgcc in all LIBRARY_PATHs
[vlc] / extras / package / npapi.am
index ec1e9dfa4355803f78bf94f059985baacb57b282..6c7bfcdfce085949fcecd5986576a1424da455b8 100644 (file)
@@ -2,6 +2,10 @@
 
 build-npapi: stamp-npapi-build
 
+stamp-gecko-fetch:
+       svn export http://npapi-sdk.googlecode.com/svn/trunk/headers gecko -r HEAD
+       touch $@
+
 stamp-npapi-fetch:
        rm -Rf npapi-vlc
        git clone git://git.videolan.org/npapi-vlc.git npapi-vlc
@@ -13,23 +17,16 @@ 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-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)" \
                LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
-               MOZILLA_CFLAGS="-I$(CONTRIB_DIR)/gecko-sdk" \
+               MOZILLA_CFLAGS="-I$(abs_builddir)/gecko" \
                SHELL="$(SHELL)" \
                PKG_CONFIG_LIBDIR="../$(srcdir)/extras/contrib/lib/pkgconfig:../lib"
        touch $@