mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-05-07 05:53:06 +00:00
adapt for lastest polarssl on windows, fix system include paths preempting
ortp and ms2 include paths.
This commit is contained in:
parent
5f6b3fa729
commit
41232a3954
4 changed files with 8 additions and 14 deletions
12
configure.ac
12
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
|
||||
|
|
|
|||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 88141afd7223345851ce9c04c759a996b1bf2d58
|
||||
Subproject commit adbdf050e08933859bdc424026adb24fa4b3f951
|
||||
Loading…
Add table
Reference in a new issue