From: Simon Morlat <simon.morlat@linphone.org>
Date: Wed, 2 Nov 2011 10:24:01 +0000 (+0100)
Subject: fixes for windows
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=b2b39d54162ebc7f44bc41b3ff704b5095f19c62

fixes for windows
---

diff --git a/Makefile.am b/Makefile.am
index c53fd3ac..d2ddf987 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,7 +98,6 @@ other-cherrypick:
 		/mingw/bin/libstdc++-6.dll \
 		/mingw/bin/libintl-8.dll \
 		/mingw/bin/libiconv-2.dll \
-		/mingw/bin/libpthread-2.dll \
 		$(INSTALLDIR_WITH_PREFIX)/bin/.
 
 
diff --git a/linphone-deps.filelist b/linphone-deps.filelist
index de01182c..9d7270a6 100755
--- a/linphone-deps.filelist
+++ b/linphone-deps.filelist
@@ -1,9 +1,9 @@
 ./bin/avcodec-53.dll
 ./bin/avutil-51.dll
-./bin/libeXosip2-6.dll
+./bin/libeXosip2-7.dll
 ./bin/libogg-0.dll
 ./bin/libtheora-0.dll
 ./bin/libxml2-2.dll
-./bin/libosip2-6.dll
-./bin/libosipparser2-6.dll
+./bin/libosip2-7.dll
+./bin/libosipparser2-7.dll
 ./bin/swscale-2.dll
diff --git a/mediastreamer2 b/mediastreamer2
index 621a1fbb..672a3365 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 621a1fbb0fd06736bbd119247a3fff60ebdaf095
+Subproject commit 672a3365cf31dd23c502169301a6994e7ae4b67c