Skip to content

L
linphone-desktop
Commit a7bfae9c authored by Jehan Monnier's avatar Jehan Monnier
Browse files
Options

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

parents f7d8f6ba 43ac096f
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
.gitmodules
View file @ a7bfae9c
...@@ -22,9 +22,6 @@ ...@@ -22,9 +22,6 @@
[submodule "submodules/mssilk"] [submodule "submodules/mssilk"]
path = submodules/mssilk path = submodules/mssilk
url = git://git.linphone.org/mssilk.git url = git://git.linphone.org/mssilk.git
[submodule "submodules/mswasapi"]
path = submodules/mswasapi
url = git://git.linphone.org/mswasapi.git
[submodule "submodules/msx264"] [submodule "submodules/msx264"]
path = submodules/msx264 path = submodules/msx264
url = git://git.linphone.org/msx264.git url = git://git.linphone.org/msx264.git
......
prepare.py
View file @ a7bfae9c
...@@ -81,6 +81,7 @@ class PythonTarget(prepare.Target): ...@@ -81,6 +81,7 @@ class PythonTarget(prepare.Target):
self.config_file = 'configs/config-python.cmake' self.config_file = 'configs/config-python.cmake'
self.output = 'OUTPUT/' + self.name self.output = 'OUTPUT/' + self.name
self.external_source_path = os.path.join(current_path, 'submodules') 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): class PythonRaspberryTarget(prepare.Target):
......
libjpeg-turbo @ 9f34b5ea
Subproject commit 69ea52a05d75a45d4aa54e0558c64d52bdb39604 Subproject commit 9f34b5eade75fd8e1548e6c7daf278d6ffb73526
libmatroska-c @ 0c725091
Subproject commit 12efd631fbeebafdeb7a870ad0c1ed7931a2d95f Subproject commit 0c7250913a2f87d4640b64a347918280569f3148
oRTP @ bd792338
Subproject commit bd792338c47c3849cce3661d4e693df0177873c0
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

Technounit-GROUP 2023