[vlc-commits] Contribs: build shout without threads on Windows

Jean-Baptiste Kempf git at videolan.org
Thu Apr 4 13:49:12 CEST 2013


vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Mar 14 17:15:39 2013 +0100| [8236e2f3d20d8df78aea37aec3da5757376efc8c] | committer: Jean-Baptiste Kempf

Contribs: build shout without threads on Windows
(cherry picked from commit 18fea8c1cba5e471cc48885adbb24ed5a36c8d83)

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

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=8236e2f3d20d8df78aea37aec3da5757376efc8c
---

 contrib/src/shout/rules.mak |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index abfb5d9..eab3cbb 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -24,7 +24,13 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
 DEPS_shout = ogg $(DEPS_ogg) theora $(DEPS_theora) speex $(DEPS_speex)
 DEPS_shout += vorbis $(DEPS_vorbis)
 
+SHOUT_CONF :=
+
+ifdef HAVE_WIN32
+SHOUT_CONF += "--disable-thread"
+endif
+
 .shout: libshout
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $< && $(HOSTVARS) ./configure $(SHOUT_CONF) $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@



More information about the vlc-commits mailing list