From cef57771c87a0bf6eddb282b569c68a7263e725c Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 5 Oct 2015 17:55:54 +0200 Subject: [PATCH] Experimental support of grouped external source build. --- prepare.py | 23 ++++------------------- submodules/belle-sip | 2 +- submodules/cmake-builder | 2 +- submodules/linphone | 2 +- 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/prepare.py b/prepare.py index 406c815f9..71bc18074 100755 --- a/prepare.py +++ b/prepare.py @@ -186,26 +186,11 @@ def main(argv=None): additional_args += ["-DENABLE_DEBUG_LOGS=YES"] if args.minimal: - additional_args = ["-DLINPHONE_BUILDER_BUILD_DEPENDENCIES=NO", - "-DENABLE_AMRNB=NO", - "-DENABLE_AMRWB=NO", - "-DENABLE_DOC=NO", - "-DENABLE_G729=NO", - "-DENABLE_GSM=NO", - "-DENABLE_H263=NO", - "-DENABLE_H263P=NO", - "-DENABLE_ILBC=NO", - "-DENABLE_ISAC=NO", + additional_args = ["-DLINPHONE_BUILDER_BUILD_ONLY_EXTERNAL_SOURCE_PATH=YES", + "-DLINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS=YES", "-DENABLE_MKV=NO", - "-DENABLE_MPEG4=NO", - "-DENABLE_OPENH264=NO", - "-DENABLE_OPUS=NO", - "-DENABLE_PACKAGING=NO", - "-DENABLE_SILK=NO", - "-DENABLE_SRTP=NO", - "-DENABLE_VPX=NO", - "-DENABLE_WASAPI=NO", - "-DENABLE_ZRTP=NO"] + additional_args + "-DENABLE_ZRTP=NO", + "-DENABLE_PACKAGING=NO"] + additional_args if check_tools() != 0: return 1 diff --git a/submodules/belle-sip b/submodules/belle-sip index df8d4f2e2..d9372d606 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit df8d4f2e29d1ecccae2cbc35954cc4d1a7715c8b +Subproject commit d9372d606f15a0f617c85d0053dff262c769166a diff --git a/submodules/cmake-builder b/submodules/cmake-builder index ebb7eb472..1f8a88500 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit ebb7eb472c94afc49759ffb7eb87914032086226 +Subproject commit 1f8a88500eeb74b1a5fa5eeaf35bfe5112711f6f diff --git a/submodules/linphone b/submodules/linphone index aadad2dde..b3c247b6d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit aadad2dde368c7b2e7b8ee7c6ee7ed6403c11567 +Subproject commit b3c247b6d73278c0fc35b56839867d93e1c7d296