witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

submodules: update cmake-builder and linphone

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-11-27 15:49:18 +01:00
parent 3e8be09f46
commit 1631cb3adb
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
prepare.py
View file

@ -464,7 +464,9 @@ def main(argv=None):
argparser.add_argument(
'-L', '--list-cmake-variables', help="(debug) List non-advanced CMake cache variables.", action='store_true', dest='list_cmake_variables')
args, additional_args = argparser.parse_known_args()
args, additional_args2 = argparser.parse_known_args()
additional_args = []
additional_args += ["-G", args.generator]
@ -509,6 +511,9 @@ def main(argv=None):
warning("Tunnel enabled, disabling GPL third parties.")
additional_args += ["-DENABLE_TUNNEL=ON", "-DENABLE_GPL_THIRD_PARTIES=OFF"]
# User's options are priority upon all automatic options
additional_args += additional_args2
if args.list_features:
list_features(args.debug, additional_args)
return 0

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit 59d40bdb82fd7ea89b94e80e563771fbc7d41ada
Subproject commit bdf7594a81c7c5058b1c4fd1a9cd460bb4666ae7

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit 96588471afd37dc0f920e4d9c7c505cb4288d5e4
Subproject commit d490f9a8b159ee90486c07576425c87af0fb3862

2
submodules/linphone

@ -1 +1 @@
Subproject commit 591a9b88b7df18f4631fa55edf232c1c6dfbdd17
Subproject commit f68cf75d749df061cb5753c3ee13c7dec3aa9c5f