[vlc-commits] npapi: fetch gecko headers required for windows

Rafaël Carré git at videolan.org
Thu Dec 22 11:57:21 CET 2011


vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Wed Dec  7 22:52:25 2011 -0500| [ac804fcf61e2ae5cae6f7c533bed10ea4bf9f0d2] | committer: Jean-Baptiste Kempf

npapi: fetch gecko headers required for windows
(cherry picked from commit 6a6a6e9008e562d85d60907fac9c87d0e99859f3)

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

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=ac804fcf61e2ae5cae6f7c533bed10ea4bf9f0d2
---

 extras/package/npapi.am |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extras/package/npapi.am b/extras/package/npapi.am
index 759082f..8bde4c4 100644
--- a/extras/package/npapi.am
+++ b/extras/package/npapi.am
@@ -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
@@ -19,7 +23,7 @@ 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=/ \
@@ -29,7 +33,7 @@ stamp-npapi-configure: stamp-npapi-autogen
 		CC="$(CC)" CFLAGS="$(CFLAGS)" \
 		CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
 		LD="$(LD)" LDFLAGS="$(LDFLAGS)" \
-		MOZILLA_CFLAGS="-I$(CONTRIB_DIR)/gecko-sdk/include" \
+		MOZILLA_CFLAGS="-I$(abs_builddir)/gecko" \
 		SHELL="$(SHELL)" \
 		PKG_CONFIG_LIBDIR="../$(srcdir)/extras/contrib/lib/pkgconfig:../lib"
 	touch $@



More information about the vlc-commits mailing list