From 735e901bf64a7d7a3be789593e3a02ef16cf6647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 18 Sep 2014 18:29:34 +0200 Subject: [PATCH] Add new functions to the tunnel API --- Makefile | 4 ++-- sample/.classpath | 4 ++-- submodules/linphone | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5e46b1c5f..561328066 100644 --- a/Makefile +++ b/Makefile @@ -49,12 +49,12 @@ BUILD_AMRNB=full # 0, light or full BUILD_AMRWB=1 BUILD_ZRTP=1 BUILD_SILK=1 -BUILD_TUNNEL=0 +BUILD_TUNNEL=1 BUILD_WEBRTC_AECM=1 BUILD_OPUS=1 BUILD_MATROSKA=0 BUILD_WEBRTC_ISAC=1 -BUILD_FOR_X86=1 +BUILD_FOR_X86=0 USE_JAVAH=1 BUILD_TLS=1 BUILD_SQLITE=1 diff --git a/sample/.classpath b/sample/.classpath index 658bfc10e..d8c730618 100644 --- a/sample/.classpath +++ b/sample/.classpath @@ -1,13 +1,13 @@ - - + + diff --git a/submodules/linphone b/submodules/linphone index df58cddb5..68b4b6371 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit df58cddb5d09bba69802ee33aee5385607fd1a68 +Subproject commit 68b4b63712444929f85e9b4670b6f5a7d7a707ea