Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
6194c51e
Commit
6194c51e
authored
Aug 24, 2015
by
Gautier Pelloux-Prayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
submodules: update belle-sip cmake-builder linphone
parent
fc4eb9c4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
25 deletions
+28
-25
belle-sip
belle-sip
+1
-1
cmake-builder
cmake-builder
+1
-1
linphone
linphone
+1
-1
prepare.py
prepare.py
+25
-22
No files found.
belle-sip
@
298264c5
Subproject commit
91ae7c164d9d20fd36657943a0aba807b4dfeb4f
Subproject commit
298264c56d933a9305395439c988d6ad916a3266
cmake-builder
@
968ce552
Subproject commit
fafed86c9a3c61b2093572f8f73c8f345c83184b
Subproject commit
968ce552cb8fee383272406f78a7b817712cb5e5
linphone
@
34e9384f
Subproject commit
06f2556e5ad70e35b7df4f0c3265dd55503fdd3b
Subproject commit
34e9384ff15610af1ca2314f4332e183c3658d55
prepare.py
View file @
6194c51e
...
@@ -32,7 +32,8 @@ sys.path.insert(0, 'cmake-builder')
...
@@ -32,7 +32,8 @@ sys.path.insert(0, 'cmake-builder')
try
:
try
:
import
prepare
import
prepare
except
:
except
:
print
(
"Could not find prepare module, probably missing cmake-builder? Try running: git submodule update --init --recursive"
)
print
(
"Could not find prepare module, probably missing cmake-builder? Try running: git submodule update --init --recursive"
)
exit
(
1
)
exit
(
1
)
...
@@ -76,7 +77,7 @@ def check_tools():
...
@@ -76,7 +77,7 @@ def check_tools():
# print(error.format(glibtoolize_path, glibtoolize_path.replace("glibtoolize", "libtoolize")))
# print(error.format(glibtoolize_path, glibtoolize_path.replace("glibtoolize", "libtoolize")))
# devnull = open(os.devnull, 'wb')
# devnull = open(os.devnull, 'wb')
#
#
just ensure that JDK is installed - if not, it will automatiaclyl display a popup to user
# just ensure that JDK is installed - if not, it will automatiaclyl display a popup to user
# p = Popen("java -version".split(" "), stderr=devnull, stdout=devnull)
# p = Popen("java -version".split(" "), stderr=devnull, stdout=devnull)
# p.wait()
# p.wait()
# if p.returncode != 0:
# if p.returncode != 0:
...
@@ -84,7 +85,7 @@ def check_tools():
...
@@ -84,7 +85,7 @@ def check_tools():
# print("Please install Java JDK (not just JRE).")
# print("Please install Java JDK (not just JRE).")
# ret = 1
# ret = 1
#
#
needed by x264
# needed by x264
# check_is_installed("gas-preprocessor.pl", """it:
# check_is_installed("gas-preprocessor.pl", """it:
# wget --no-check-certificate https://raw.github.com/yuvi/gas-preprocessor/master/gas-preprocessor.pl
# wget --no-check-certificate https://raw.github.com/yuvi/gas-preprocessor/master/gas-preprocessor.pl
# chmod +x gas-preprocessor.pl
# chmod +x gas-preprocessor.pl
...
@@ -239,29 +240,31 @@ def main(argv=None):
...
@@ -239,29 +240,31 @@ def main(argv=None):
args
,
additional_args
=
argparser
.
parse_known_args
()
args
,
additional_args
=
argparser
.
parse_known_args
()
additional_args
+=
[
"-DLINPHONE_BUILDER_BUILD_DEPENDENCIES=NO"
]
if
args
.
debug_verbose
:
if
args
.
debug_verbose
:
additional_args
+=
[
"-DENABLE_DEBUG_LOGS=YES"
]
additional_args
+=
[
"-DENABLE_DEBUG_LOGS=YES"
]
if
args
.
minimal
:
if
args
.
minimal
:
additional_args
+=
[
"-DENABLE_AMRNB=NO"
]
additional_args
=
[
"-DLINPHONE_BUILDER_BUILD_DEPENDENCIES=NO"
,
additional_args
+=
[
"-DENABLE_AMRWB=NO"
]
"-DENABLE_AMRNB=NO"
,
additional_args
+=
[
"-DENABLE_DOC=NO"
]
"-DENABLE_AMRWB=NO"
,
additional_args
+=
[
"-DENABLE_G729=NO"
]
"-DENABLE_DOC=NO"
,
additional_args
+=
[
"-DENABLE_GSM=NO"
]
"-DENABLE_G729=NO"
,
additional_args
+=
[
"-DENABLE_H263=NO"
]
"-DENABLE_GSM=NO"
,
additional_args
+=
[
"-DENABLE_H263P=NO"
]
"-DENABLE_H263=NO"
,
additional_args
+=
[
"-DENABLE_ILBC=NO"
]
"-DENABLE_H263P=NO"
,
additional_args
+=
[
"-DENABLE_ISAC=NO"
]
"-DENABLE_ILBC=NO"
,
additional_args
+=
[
"-DENABLE_MPEG4=NO"
]
"-DENABLE_ISAC=NO"
,
additional_args
+=
[
"-DENABLE_OPENH264=NO"
]
"-DENABLE_MKV=NO"
,
additional_args
+=
[
"-DENABLE_OPUS=NO"
]
"-DENABLE_MPEG4=NO"
,
additional_args
+=
[
"-DENABLE_PACKAGING=NO"
]
"-DENABLE_OPENH264=NO"
,
additional_args
+=
[
"-DENABLE_SILK=NO"
]
"-DENABLE_OPUS=NO"
,
additional_args
+=
[
"-DENABLE_SRTP=NO"
]
"-DENABLE_PACKAGING=NO"
,
additional_args
+=
[
"-DENABLE_VPX=NO"
]
"-DENABLE_SILK=NO"
,
additional_args
+=
[
"-DENABLE_WASAPI=NO"
]
"-DENABLE_SRTP=NO"
,
additional_args
+=
[
"-DENABLE_ZRTP=NO"
]
"-DENABLE_VPX=NO"
,
"-DENABLE_WASAPI=NO"
,
"-DENABLE_ZRTP=NO"
,
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.10"
]
+
additional_args
if
check_tools
()
!=
0
:
if
check_tools
()
!=
0
:
return
1
return
1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment