From 4f433fb87d6f8633cc37018550b6aa38911bc089 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 21 Jun 2016 17:16:05 +0200 Subject: [PATCH] Fix in Makefile generation with the Xcode generator. --- .gitignore | 1 + prepare.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5a8514f7b..7f2a95cf5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ Makefile submodules/tunnel record_for_lc_*.wav .bc_tester_utils.tmp +prepare.conf.user diff --git a/prepare.py b/prepare.py index 6f5c31086..b7ff137bc 100755 --- a/prepare.py +++ b/prepare.py @@ -150,7 +150,7 @@ class DesktopPreparator(prepare.Preparator): if os.path.isdir('OUTPUT') and not os.listdir('OUTPUT'): os.rmdir('OUTPUT') - def generate_makefile(self, generator): + def generate_makefile(self, generator, project_file=''): targets = self.args.target targets_str = "" for target in targets: @@ -158,9 +158,9 @@ class DesktopPreparator(prepare.Preparator): {target}: {target}-build {target}-build: -\t{generator} WORK/{target}/cmake +\t{generator} WORK/{target}/cmake/{project_file} \t@echo "Done" -""".format(target=target, generator=generator) +""".format(target=target, generator=generator, project_file=project_file) makefile = """ targets={targets}