mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

prepare.py: do not turn off GPL third parties when tunnel is enabled

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-09-24 11:29:41 +02:00
parent 1562978e43
commit 20a49cbf9b
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
prepare.py
View file

@ -205,8 +205,7 @@ def main(argv=None):
"-DENABLE_SRTP=NO",
"-DENABLE_VPX=NO",
"-DENABLE_WASAPI=NO",
"-DENABLE_ZRTP=NO",
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.10"] + additional_args
"-DENABLE_ZRTP=NO"] + additional_args
if check_tools() != 0:
return 1
@ -219,8 +218,8 @@ def main(argv=None):
if p.retcode != 0:
print("Could not clone tunnel. Please see http://www.belledonne-communications.com/voiptunnel.html")
return 1
print("Tunnel enabled, disabling GPL third parties.")
additional_args += ["-DENABLE_TUNNEL=ON", "-DENABLE_GPL_THIRD_PARTIES=OFF"]
print("Tunnel enabled.")
additional_args += ["-DENABLE_TUNNEL=ON"]
# install_git_hook()

2
submodules/belle-sip

@ -1 +1 @@
Subproject commit c93a01615811bccdcfbc65aad7247babd1356d72
Subproject commit df8d4f2e29d1ecccae2cbc35954cc4d1a7715c8b

2
submodules/cmake-builder

@ -1 +1 @@
Subproject commit a412dc2e7d4b0267dce577efb7e8f5e3048d111e
Subproject commit ebb7eb472c94afc49759ffb7eb87914032086226

2
submodules/linphone

@ -1 +1 @@
Subproject commit ce30644995afb1998eaa9e4dcc6f6b747292d25b
Subproject commit aadad2dde368c7b2e7b8ee7c6ee7ed6403c11567