Commit f048383b authored by Ghislain MARY's avatar Ghislain MARY

Enable LIME X3DH by default.

parent 49c7c836
...@@ -47,7 +47,6 @@ set(DEFAULT_VALUE_ENABLE_VPX ON) ...@@ -47,7 +47,6 @@ set(DEFAULT_VALUE_ENABLE_VPX ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AECM ON) set(DEFAULT_VALUE_ENABLE_WEBRTC_AECM ON)
set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC ON) set(DEFAULT_VALUE_ENABLE_WEBRTC_AEC ON)
set(DEFAULT_VALUE_ENABLE_ZRTP ON) set(DEFAULT_VALUE_ENABLE_ZRTP ON)
set(DEFAULT_VALUE_ENABLE_LIME ON)
set(DEFAULT_VALUE_ENABLE_TOOLS OFF) set(DEFAULT_VALUE_ENABLE_TOOLS OFF)
set(DEFAULT_VALUE_ENABLE_JAVA_WRAPPER ON) set(DEFAULT_VALUE_ENABLE_JAVA_WRAPPER ON)
set(ENABLE_NLS NO CACHE BOOL "" FORCE) set(ENABLE_NLS NO CACHE BOOL "" FORCE)
...@@ -30,8 +30,6 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON) ...@@ -30,8 +30,6 @@ set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
set(DEFAULT_VALUE_ENABLE_GSM ON) set(DEFAULT_VALUE_ENABLE_GSM ON)
set(DEFAULT_VALUE_ENABLE_GTK_UI OFF) set(DEFAULT_VALUE_ENABLE_GTK_UI OFF)
set(DEFAULT_VALUE_ENABLE_JPEG ON) set(DEFAULT_VALUE_ENABLE_JPEG ON)
set(DEFAULT_VALUE_ENABLE_LIME OFF)
set(DEFAULT_VALUE_ENABLE_LIME_X3DH OFF)
set(DEFAULT_VALUE_ENABLE_MBEDTLS ON) set(DEFAULT_VALUE_ENABLE_MBEDTLS ON)
set(DEFAULT_VALUE_ENABLE_MKV ON) set(DEFAULT_VALUE_ENABLE_MKV ON)
set(DEFAULT_VALUE_ENABLE_NLS OFF) set(DEFAULT_VALUE_ENABLE_NLS OFF)
......
...@@ -40,6 +40,5 @@ set(DEFAULT_VALUE_ENABLE_VCARD ON) ...@@ -40,6 +40,5 @@ set(DEFAULT_VALUE_ENABLE_VCARD ON)
set(DEFAULT_VALUE_ENABLE_VIDEO ON) set(DEFAULT_VALUE_ENABLE_VIDEO ON)
set(DEFAULT_VALUE_ENABLE_VPX ON) set(DEFAULT_VALUE_ENABLE_VPX ON)
set(DEFAULT_VALUE_ENABLE_ZRTP ON) set(DEFAULT_VALUE_ENABLE_ZRTP ON)
set(DEFAULT_VALUE_ENABLE_LIME ON)
set(DEFAULT_VALUE_ENABLE_TOOLS OFF) set(DEFAULT_VALUE_ENABLE_TOOLS OFF)
set(DEFAULT_VALUE_ENABLE_UPDATE_CHECK ON) set(DEFAULT_VALUE_ENABLE_UPDATE_CHECK ON)
...@@ -29,7 +29,6 @@ set(DEFAULT_VALUE_ENABLE_G729B_CNG OFF) ...@@ -29,7 +29,6 @@ set(DEFAULT_VALUE_ENABLE_G729B_CNG OFF)
set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON) set(DEFAULT_VALUE_ENABLE_GPL_THIRD_PARTIES ON)
set(DEFAULT_VALUE_ENABLE_GSM ON) set(DEFAULT_VALUE_ENABLE_GSM ON)
set(DEFAULT_VALUE_ENABLE_JPEG ON) set(DEFAULT_VALUE_ENABLE_JPEG ON)
set(DEFAULT_VALUE_ENABLE_LIME ON)
set(DEFAULT_VALUE_ENABLE_MBEDTLS ON) set(DEFAULT_VALUE_ENABLE_MBEDTLS ON)
set(DEFAULT_VALUE_ENABLE_MKV ON) set(DEFAULT_VALUE_ENABLE_MKV ON)
set(DEFAULT_VALUE_ENABLE_OPUS ON) set(DEFAULT_VALUE_ENABLE_OPUS ON)
......
...@@ -26,8 +26,8 @@ lcb_add_option("GTK UI" "Enable the GTK user interface of Linphone." "${DEFAULT_ ...@@ -26,8 +26,8 @@ lcb_add_option("GTK UI" "Enable the GTK user interface of Linphone." "${DEFAULT_
lcb_add_option("CXX wrapper" "Build the C++ wrapper for Liblinphone." "${DEFAULT_VALUE_ENABLE_CXX_WRAPPER}") lcb_add_option("CXX wrapper" "Build the C++ wrapper for Liblinphone." "${DEFAULT_VALUE_ENABLE_CXX_WRAPPER}")
lcb_add_option("CSharp wrapper" "Build the C# wrapper from Liblinphone." "${DEFAULT_VALUE_ENABLE_CSHARP_WRAPPER}") lcb_add_option("CSharp wrapper" "Build the C# wrapper from Liblinphone." "${DEFAULT_VALUE_ENABLE_CSHARP_WRAPPER}")
lcb_add_option("Java wrapper" "Build the Java wrapper from Liblinphone." "${DEFAULT_VALUE_ENABLE_JAVA_WRAPPER}") lcb_add_option("Java wrapper" "Build the Java wrapper from Liblinphone." "${DEFAULT_VALUE_ENABLE_JAVA_WRAPPER}")
lcb_add_option("LIME" "Enable Linphone IM Encryption support in Liblinphone." "${DEFAULT_VALUE_ENABLE_LIME}") lcb_add_option("LIME" "Enable Linphone IM Encryption support in Liblinphone." OFF)
lcb_add_option("LIME X3DH" "Enable Linphone IM Encryption version 2 support in Liblinphone." "${DEFAULT_VALUE_ENABLE_LIME_X3DH}") lcb_add_option("LIME X3DH" "Enable Linphone IM Encryption version 2 support in Liblinphone." ON)
lcb_add_option("NLS" "Enable internationalization of Linphone and Liblinphone." "${DEFAULT_VALUE_ENABLE_NLS}") lcb_add_option("NLS" "Enable internationalization of Linphone and Liblinphone." "${DEFAULT_VALUE_ENABLE_NLS}")
lcb_add_option("Update Check" "Enable update check." "${DEFAULT_VALUE_ENABLE_UPDATE_CHECK}") lcb_add_option("Update Check" "Enable update check." "${DEFAULT_VALUE_ENABLE_UPDATE_CHECK}")
lcb_add_option("VCARD" "Enable vCard 4 support in Linphone and Liblinphone." "${DEFAULT_VALUE_ENABLE_VCARD}") lcb_add_option("VCARD" "Enable vCard 4 support in Linphone and Liblinphone." "${DEFAULT_VALUE_ENABLE_VCARD}")
......
...@@ -33,7 +33,7 @@ file(READ "${CMAKE_ANDROID_NDK}/source.properties" SOURCE_PROPERTIES_CONTENT) ...@@ -33,7 +33,7 @@ file(READ "${CMAKE_ANDROID_NDK}/source.properties" SOURCE_PROPERTIES_CONTENT)
string(REGEX MATCH "Pkg\\.Revision = ([0-9]+)\\." NDK_VERSION_MATCH "${SOURCE_PROPERTIES_CONTENT}") string(REGEX MATCH "Pkg\\.Revision = ([0-9]+)\\." NDK_VERSION_MATCH "${SOURCE_PROPERTIES_CONTENT}")
set(CMAKE_ANDROID_NDK_VERSION ${CMAKE_MATCH_1}) set(CMAKE_ANDROID_NDK_VERSION ${CMAKE_MATCH_1})
set(ANDROID_NATIVE_API_LEVEL "android-16") set(ANDROID_NATIVE_API_LEVEL "android-17")
set(ANDROID_CPP_FEATURES "rtti exceptions") set(ANDROID_CPP_FEATURES "rtti exceptions")
set(ANDROID_STL "c++_shared") set(ANDROID_STL "c++_shared")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment