Commit 4f433fb8 authored by Ghislain MARY's avatar Ghislain MARY

Fix in Makefile generation with the Xcode generator.

parent b2dc7c64
...@@ -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
...@@ -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}
......
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