aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-12-24 23:30:22 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-12-24 23:30:22 +0200
commiteddcff455eb4e5911e198e012d6b71e8a2fdf6be (patch)
tree23ec7d3ef9f886a8a55d4b22e44d2d62c656f933
parent330a5601cf3bd23a9931d5affdb53670485e8ad2 (diff)
downloadmeson-eddcff455eb4e5911e198e012d6b71e8a2fdf6be.zip
meson-eddcff455eb4e5911e198e012d6b71e8a2fdf6be.tar.gz
meson-eddcff455eb4e5911e198e012d6b71e8a2fdf6be.tar.bz2
Some xcodefixes.
-rw-r--r--xcodebackend.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/xcodebackend.py b/xcodebackend.py
index 847b5af..d72cbdf 100644
--- a/xcodebackend.py
+++ b/xcodebackend.py
@@ -52,7 +52,7 @@ class XCodeBackend(backends.Backend):
return str(uuid.uuid4()).upper().replace('-', '')[:24]
def get_target_dir(self, target):
- dirname = os.path.join(target.get_subdir(), self.environment.coredata.buildtype)
+ dirname = os.path.join(target.get_subdir(), self.environment.coredata.get_builtin_option('buildtype'))
os.makedirs(os.path.join(self.environment.get_build_dir(), dirname), exist_ok=True)
return dirname
@@ -78,7 +78,6 @@ class XCodeBackend(backends.Backend):
self.generate_target_dependency_map()
self.generate_pbxdep_map()
self.generate_containerproxy_map()
- self.generate_pkgconfig_files()
self.proj_dir = os.path.join(self.environment.get_build_dir(), self.build.project_name + '.xcodeproj')
os.makedirs(self.proj_dir, exist_ok=True)
self.proj_file = os.path.join(self.proj_dir, 'project.pbxproj')