gyp/common_conditions.gypi - Issue 13852013: Fix gyp files to allow ninja to build 64 bit on Mac.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gyp/common_conditions.gypi

Issue 13852013: Fix gyp files to allow ninja to build 64 bit on Mac. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: fix build by handling kLineTypeCount in switch Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: gyp/common_conditions.gypi

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi

index feb364fd2ccbba4b614b3d28ebbbcccda29a08a1..81c958a9e3f1c65513a451ef6b4a23e7268ee330 100644

--- a/gyp/common_conditions.gypi

+++ b/gyp/common_conditions.gypi

@@ -178,12 +178,12 @@

'conditions' : [

[ 'skia_arch_width == 64', {

'xcode_settings': {

- 'ARCHS': 'x86_64',

+ 'ARCHS': ['x86_64'],

}],

[ 'skia_arch_width == 32', {

'xcode_settings': {

- 'ARCHS': 'i386',

+ 'ARCHS': ['i386'],

}],

[ 'skia_warnings_as_errors', {

@@ -274,7 +274,7 @@

'xcode_settings': {

- 'ARCHS': 'armv6 armv7',

+ 'ARCHS': ['armv6', 'armv7'],

'CODE_SIGNING_REQUIRED': 'NO',

'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',

'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)',

« no previous file with comments | « bench/DashBench.cpp ('k') | src/gpu/gl/GrGLSL.h » ('j') | no next file with comments »