summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-10-22 11:18:48 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-10-22 12:01:56 +0200
commitbaa684eb9861d83c350a4acbc58d00568817b0cd (patch)
treee3eedc4161b2b69a96745d9c81c36f635ab514fa /deps
parent159130a058a3051dacecf0e956bc1113874dfabb (diff)
downloadqtlocation-mapboxgl-baa684eb9861d83c350a4acbc58d00568817b0cd.tar.gz
make gyp generate newer project files
patch from https://groups.google.com/forum/#!msg/gyp-developer/0JiSNtsKc30/xYxQFqRfrTcJ
Diffstat (limited to 'deps')
-rw-r--r--deps/gyp/pylib/gyp/generator/xcode.py6
-rw-r--r--deps/gyp/pylib/gyp/xcodeproj_file.py3
2 files changed, 7 insertions, 2 deletions
diff --git a/deps/gyp/pylib/gyp/generator/xcode.py b/deps/gyp/pylib/gyp/generator/xcode.py
index 7972459363..a6faa4c063 100644
--- a/deps/gyp/pylib/gyp/generator/xcode.py
+++ b/deps/gyp/pylib/gyp/generator/xcode.py
@@ -604,7 +604,11 @@ def GenerateOutput(target_list, target_dicts, data, params):
if parallel_builds:
pbxp.SetProperty('attributes',
- {'BuildIndependentTargetsInParallel': 'YES'})
+ {
+ 'BuildIndependentTargetsInParallel': 'YES',
+ 'LastUpgradeCheck': '0500'
+ }
+ )
if project_version:
xcp.project_file.SetXcodeVersion(project_version)
diff --git a/deps/gyp/pylib/gyp/xcodeproj_file.py b/deps/gyp/pylib/gyp/xcodeproj_file.py
index 79c3abcf02..fc40fcb2db 100644
--- a/deps/gyp/pylib/gyp/xcodeproj_file.py
+++ b/deps/gyp/pylib/gyp/xcodeproj_file.py
@@ -2158,6 +2158,7 @@ class XCTarget(XCRemoteObject):
if configs.HasBuildSetting('PRODUCT_NAME') == 0:
configs.SetBuildSetting('PRODUCT_NAME',
self._properties['productName'])
+ configs.SetBuildSetting('COMBINE_HIDPI_IMAGES', 'YES')
def AddDependency(self, other):
pbxproject = self.PBXProjectAncestor()
@@ -2811,7 +2812,7 @@ class XCProjectFile(XCObject):
_schema.update({
'archiveVersion': [0, int, 0, 1, 1],
'classes': [0, dict, 0, 1, {}],
- 'objectVersion': [0, int, 0, 1, 45],
+ 'objectVersion': [0, int, 0, 1, 46],
'rootObject': [0, PBXProject, 1, 1],
})