Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
fix more xcode upgrade warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
kkaefer committed Oct 22, 2014
1 parent baa684e commit 13c698f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
6 changes: 6 additions & 0 deletions deps/gyp/pylib/gyp/generator/xcode.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
# targets that share the same BUILT_PRODUCTS_DIR.
_shared_intermediate_var = 'SHARED_INTERMEDIATE_DIR'

# ONLY_ACTIVE_ARCH means that only the active architecture should be build for
# Debugging purposes to shorten the build time
_only_active_arch = 'ONLY_ACTIVE_ARCH'

_library_search_paths_var = 'LIBRARY_SEARCH_PATHS'

generator_default_variables = {
Expand Down Expand Up @@ -168,6 +172,8 @@ def Finalize1(self, xcode_targets, serialize_all_tests):
xccl.SetBuildSetting(_shared_intermediate_var,
'$(SYMROOT)/DerivedSources/$(CONFIGURATION)')

xccl.ConfigurationNamed('Debug').SetBuildSetting(_only_active_arch, 'YES')

# Set user-specified project-wide build settings and config files. This
# is intended to be used very sparingly. Really, almost everything should
# go into target-specific build settings sections. The project-wide
Expand Down
3 changes: 1 addition & 2 deletions mapboxgl.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,7 @@
],
'xcode_settings': {
'SDKROOT': 'iphoneos',
'SUPPORTED_PLATFORMS': ['iphonesimulator','iphoneos'],
'ARCHS': [ "armv7", "armv7s", "arm64", "i386", "x86_64" ],
'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
'TARGETED_DEVICE_FAMILY': '1,2',
'CODE_SIGN_IDENTITY': 'iPhone Developer',
'IPHONEOS_DEPLOYMENT_TARGET': '7.0',
Expand Down

0 comments on commit 13c698f

Please sign in to comment.