Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « bench/DashBench.cpp ('k') | src/gpu/gl/GrGLSL.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # conditions used in both common.gypi and skia.gyp in chromium 1 # conditions used in both common.gypi and skia.gyp in chromium
2 # 2 #
3 { 3 {
4 'defines': [ 4 'defines': [
5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)', 5 'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR', 6 # 'SK_SUPPORT_HINTING_SCALE_FACTOR',
7 ], 7 ],
8 'conditions' : [ 8 'conditions' : [
9 [ 'skia_gpu == 1', 9 [ 'skia_gpu == 1',
10 { 10 {
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 { 171 {
172 'variables': { 172 'variables': {
173 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)', 173 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)',
174 }, 174 },
175 'defines': [ 175 'defines': [
176 'SK_BUILD_FOR_MAC', 176 'SK_BUILD_FOR_MAC',
177 ], 177 ],
178 'conditions' : [ 178 'conditions' : [
179 [ 'skia_arch_width == 64', { 179 [ 'skia_arch_width == 64', {
180 'xcode_settings': { 180 'xcode_settings': {
181 'ARCHS': 'x86_64', 181 'ARCHS': ['x86_64'],
182 }, 182 },
183 }], 183 }],
184 [ 'skia_arch_width == 32', { 184 [ 'skia_arch_width == 32', {
185 'xcode_settings': { 185 'xcode_settings': {
186 'ARCHS': 'i386', 186 'ARCHS': ['i386'],
187 }, 187 },
188 }], 188 }],
189 [ 'skia_warnings_as_errors', { 189 [ 'skia_warnings_as_errors', {
190 'xcode_settings': { 190 'xcode_settings': {
191 'OTHER_CPLUSPLUSFLAGS': [ 191 'OTHER_CPLUSPLUSFLAGS': [
192 '-Werror', 192 '-Werror',
193 ], 193 ],
194 }, 194 },
195 }], 195 }],
196 ], 196 ],
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 }, 267 },
268 }, 268 },
269 'Release': { 269 'Release': {
270 'xcode_settings': { 270 'xcode_settings': {
271 'GCC_OPTIMIZATION_LEVEL': '3', 271 'GCC_OPTIMIZATION_LEVEL': '3',
272 }, 272 },
273 'defines': [ 'NDEBUG' ], 273 'defines': [ 'NDEBUG' ],
274 }, 274 },
275 }, 275 },
276 'xcode_settings': { 276 'xcode_settings': {
277 'ARCHS': 'armv6 armv7', 277 'ARCHS': ['armv6', 'armv7'],
278 'CODE_SIGNING_REQUIRED': 'NO', 278 'CODE_SIGNING_REQUIRED': 'NO',
279 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '', 279 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
280 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)', 280 'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)',
281 'SDKROOT': 'iphoneos', 281 'SDKROOT': 'iphoneos',
282 'TARGETED_DEVICE_FAMILY': '1,2', 282 'TARGETED_DEVICE_FAMILY': '1,2',
283 'OTHER_CPLUSPLUSFLAGS': [ 283 'OTHER_CPLUSPLUSFLAGS': [
284 '-fvisibility=hidden', 284 '-fvisibility=hidden',
285 '-fvisibility-inlines-hidden', 285 '-fvisibility-inlines-hidden',
286 ], 286 ],
287 'GCC_THUMB_SUPPORT': 'NO', 287 'GCC_THUMB_SUPPORT': 'NO',
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 'xcode_settings': { 376 'xcode_settings': {
377 'SYMROOT': '<(DEPTH)/xcodebuild', 377 'SYMROOT': '<(DEPTH)/xcodebuild',
378 }, 378 },
379 } 379 }
380 380
381 # Local Variables: 381 # Local Variables:
382 # tab-width:2 382 # tab-width:2
383 # indent-tabs-mode:nil 383 # indent-tabs-mode:nil
384 # End: 384 # End:
385 # vim: set expandtab tabstop=2 shiftwidth=2: 385 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « bench/DashBench.cpp ('k') | src/gpu/gl/GrGLSL.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698