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
4f433fb8
Commit
4f433fb8
authored
Jun 21, 2016
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix in Makefile generation with the Xcode generator.
parent
b2dc7c64
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
.gitignore
.gitignore
+1
-0
prepare.py
prepare.py
+3
-3
No files found.
.gitignore
View file @
4f433fb8
...
@@ -4,3 +4,4 @@ Makefile
...
@@ -4,3 +4,4 @@ Makefile
submodules/tunnel
submodules/tunnel
record_for_lc_*.wav
record_for_lc_*.wav
.bc_tester_utils.tmp
.bc_tester_utils.tmp
prepare.conf.user
prepare.py
View file @
4f433fb8
...
@@ -150,7 +150,7 @@ class DesktopPreparator(prepare.Preparator):
...
@@ -150,7 +150,7 @@ class DesktopPreparator(prepare.Preparator):
if
os
.
path
.
isdir
(
'OUTPUT'
)
and
not
os
.
listdir
(
'OUTPUT'
):
if
os
.
path
.
isdir
(
'OUTPUT'
)
and
not
os
.
listdir
(
'OUTPUT'
):
os
.
rmdir
(
'OUTPUT'
)
os
.
rmdir
(
'OUTPUT'
)
def
generate_makefile
(
self
,
generator
):
def
generate_makefile
(
self
,
generator
,
project_file
=
''
):
targets
=
self
.
args
.
target
targets
=
self
.
args
.
target
targets_str
=
""
targets_str
=
""
for
target
in
targets
:
for
target
in
targets
:
...
@@ -158,9 +158,9 @@ class DesktopPreparator(prepare.Preparator):
...
@@ -158,9 +158,9 @@ class DesktopPreparator(prepare.Preparator):
{target}: {target}-build
{target}: {target}-build
{target}-build:
{target}-build:
\t
{generator} WORK/{target}/cmake
\t
{generator} WORK/{target}/cmake
/{project_file}
\t
@echo "Done"
\t
@echo "Done"
"""
.
format
(
target
=
target
,
generator
=
generator
)
"""
.
format
(
target
=
target
,
generator
=
generator
,
project_file
=
project_file
)
makefile
=
"""
makefile
=
"""
targets={targets}
targets={targets}
...
...
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