From 41232a3954803528d89434f800bad64ec7ac6b62 Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 30 Jan 2015 00:00:19 +0100
Subject: [PATCH] adapt for lastest polarssl on windows, fix system include
 paths preempting ortp and ms2 include paths.

---
 configure.ac           | 12 +++---------
 coreapi/Makefile.am    |  6 +++---
 linphone-deps.filelist |  2 +-
 mediastreamer2         |  2 +-
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8d884a193..dd0c323f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,9 @@ case $target in
 		mingwce_found=yes
 	;;
 	*mingw*)
+		dnl Workaround for mingw, whose compiler does not check in /usr/include ...
+		CPPFLAGS="$CPPFLAGS -I/usr/include"
+		LDFLAGS="$LDFLAGS -L/usr/lib"
 		CFLAGS="$CFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501 "
 		CXXFLAGS="$CXXFLAGS -DORTP_STATIC -D_WIN32_WINNT=0x0501"
 		LIBS="$LIBS -lws2_32"
@@ -806,15 +809,6 @@ AC_SUBST([MS2_VERSION])
 AC_SUBST([MS2_DIR])
 
 
-case $target in
-	*mingw*)
-		dnl Workaround for mingw, whose compiler does not check in /usr/include ...
-		CPPFLAGS="$CPPFLAGS -I/usr/include"
-		LDFLAGS="$LDFLAGS -L/usr/lib"
-	;;
-esac
-
-
 AC_ARG_ENABLE(tunnel,
 	[AS_HELP_STRING([--enable-tunnel=[yes/no]], [Turn on compilation of tunnel support (default=no)])],
 	[case "${enableval}" in
diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 26fff6f6e..85f65bcf1 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -160,13 +160,13 @@ test_numbers_LDADD=liblinphone.la $(liblinphone_la_LIBADD)
 endif
 
 AM_CPPFLAGS=\
-	-I$(top_srcdir) -I$(top_srcdir)/include -I$(builddir)
+	-I$(top_srcdir) -I$(top_srcdir)/include -I$(builddir) \
+		$(ORTP_CFLAGS) \
+		$(MEDIASTREAMER_CFLAGS) 
 
 COMMON_CFLAGS=\
 	$(STRICT_OPTIONS) \
 	-DIN_LINPHONE \
-	$(ORTP_CFLAGS) \
-	$(MEDIASTREAMER_CFLAGS) \
 	$(SIPSTACK_CFLAGS) \
 	$(LIBSOUP_CFLAGS) \
 	-DENABLE_TRACE 	\
diff --git a/linphone-deps.filelist b/linphone-deps.filelist
index 53cde44a9..8a77ad29b 100755
--- a/linphone-deps.filelist
+++ b/linphone-deps.filelist
@@ -2,9 +2,9 @@
 ./bin/libspeex-1.dll
 ./bin/libspeexdsp-1.dll
 ./bin/avutil-51.dll
+./bin/libpolarssl-0.dll
 ./bin/libbellesip-0.dll
 ./bin/libantlr3c.dll
-./lib/libpolarssl.dll
 ./bin/libogg-0.dll
 ./bin/libtheora-0.dll
 ./bin/libxml2-2.dll
diff --git a/mediastreamer2 b/mediastreamer2
index 88141afd7..adbdf050e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 88141afd7223345851ce9c04c759a996b1bf2d58
+Subproject commit adbdf050e08933859bdc424026adb24fa4b3f951