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

Merge remote-tracking branch 'public/master' into dev_linphone_qt

Browse source
This commit is contained in:
Jehan Monnier 2017-06-14 10:16:23 +02:00
commit a7bfae9c9f
5 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -22,9 +22,6 @@
[submodule "submodules/mssilk"]
path = submodules/mssilk
url = git://git.linphone.org/mssilk.git
[submodule "submodules/mswasapi"]
path = submodules/mswasapi
url = git://git.linphone.org/mswasapi.git
[submodule "submodules/msx264"]
path = submodules/msx264
url = git://git.linphone.org/msx264.git

1
prepare.py
View file

@ -81,6 +81,7 @@ class PythonTarget(prepare.Target):
self.config_file = 'configs/config-python.cmake'
self.output = 'OUTPUT/' + self.name
self.external_source_path = os.path.join(current_path, 'submodules')
self.additional_args += ["-DLINPHONE_BUILDER_PYTHON_VERSION={}.{}".format(sys.version_info.major, sys.version_info.minor)]
class PythonRaspberryTarget(prepare.Target):

2
submodules/externals/libjpeg-turbo vendored

@ -1 +1 @@
Subproject commit 69ea52a05d75a45d4aa54e0558c64d52bdb39604
Subproject commit 9f34b5eade75fd8e1548e6c7daf278d6ffb73526

2
submodules/externals/libmatroska-c vendored

@ -1 +1 @@
Subproject commit 12efd631fbeebafdeb7a870ad0c1ed7931a2d95f
Subproject commit 0c7250913a2f87d4640b64a347918280569f3148

1
submodules/oRTP Submodule

@ -0,0 +1 @@
Subproject commit bd792338c47c3849cce3661d4e693df0177873c0