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

Side by Side Diff: gyp/common_conditions.gypi

Issue 137793010: Use MACOSX_DEPLOYMENT_TARGET instead of SDKROOT. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix include Created 6 years, 11 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
« no previous file with comments | « no previous file | src/views/mac/SkNSView.mm » ('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_GPU=<(skia_gpu)', 6 'SK_SUPPORT_GPU=<(skia_gpu)',
7 'SK_SUPPORT_OPENCL=<(skia_opencl)', 7 'SK_SUPPORT_OPENCL=<(skia_opencl)',
8 'SK_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)', 8 'SK_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)',
9 ], 9 ],
10 'conditions' : [ 10 'conditions' : [
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 }], 293 }],
294 [ 'skia_keep_frame_pointer', { 294 [ 'skia_keep_frame_pointer', {
295 'cflags': [ '-fno-omit-frame-pointer' ], 295 'cflags': [ '-fno-omit-frame-pointer' ],
296 }], 296 }],
297 ], 297 ],
298 }, 298 },
299 ], 299 ],
300 300
301 [ 'skia_os == "mac"', 301 [ 'skia_os == "mac"',
302 { 302 {
303 'variables': {
304 'mac_sdk%': '<!(python <(DEPTH)/tools/find_mac_sdk.py 10.6)',
305 },
306 'defines': [ 303 'defines': [
307 'SK_BUILD_FOR_MAC', 304 'SK_BUILD_FOR_MAC',
308 ], 305 ],
309 'conditions' : [ 306 'conditions' : [
310 [ 'skia_arch_width == 64', { 307 [ 'skia_arch_width == 64', {
311 'xcode_settings': { 308 'xcode_settings': {
312 'ARCHS': ['x86_64'], 309 'ARCHS': ['x86_64'],
313 }, 310 },
314 }], 311 }],
315 [ 'skia_arch_width == 32', { 312 [ 'skia_arch_width == 32', {
316 'xcode_settings': { 313 'xcode_settings': {
317 'ARCHS': ['i386'], 314 'ARCHS': ['i386'],
318 }, 315 },
319 }], 316 }],
320 [ 'skia_warnings_as_errors', { 317 [ 'skia_warnings_as_errors', {
321 'xcode_settings': { 318 'xcode_settings': {
322 'OTHER_CPLUSPLUSFLAGS': [ 319 'OTHER_CPLUSPLUSFLAGS': [
323 '-Werror', 320 '-Werror',
324 '-Wall', 321 '-Wall',
325 '-Wextra', 322 '-Wextra',
326 '-Wno-unused-parameter', 323 '-Wno-unused-parameter',
324 '-Wno-uninitialized', # Disabled because we think GCC 4.2 is ba d at this.
327 ], 325 ],
328 }, 326 },
329 }], 327 }],
330 # This old compiler is really bad at figuring out when things are uninitialized, so ignore it.
331 [ '<(mac_sdk)==10.6', {
332 'xcode_settings': {
333 'OTHER_CPLUSPLUSFLAGS': [
334 '-Wno-uninitialized',
335 ],
336 },
337 }],
338 ], 328 ],
339 'configurations': { 329 'configurations': {
340 'Coverage': { 330 'Coverage': {
341 'xcode_settings': { 331 'xcode_settings': {
342 'GCC_OPTIMIZATION_LEVEL': '0', 332 'GCC_OPTIMIZATION_LEVEL': '0',
343 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES', 333 'GCC_GENERATE_TEST_COVERAGE_FILES': 'YES',
344 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS' : 'YES', 334 'GCC_INSTRUMENT_PROGRAM_FLOW_ARCS' : 'YES',
345 }, 335 },
346 }, 336 },
347 'Debug': { 337 'Debug': {
348 'xcode_settings': { 338 'xcode_settings': {
349 'GCC_OPTIMIZATION_LEVEL': '0', 339 'GCC_OPTIMIZATION_LEVEL': '0',
350 }, 340 },
351 }, 341 },
352 'Release': { 342 'Release': {
353 'xcode_settings': { 343 'xcode_settings': {
354 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)', 344 'GCC_OPTIMIZATION_LEVEL': '<(skia_release_optimization_level)',
355 }, 345 },
356 'defines': [ 'NDEBUG' ], 346 'defines': [ 'NDEBUG' ],
357 }, 347 },
358 }, 348 },
359 'xcode_settings': { 349 'xcode_settings': {
360 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', 350 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
361 'conditions': [ 351 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed in e nvironment to ld.
362 [ 'skia_osx_sdkroot==""', {
363 'SDKROOT': 'macosx<(mac_sdk)', # -isysroot
364 }, {
365 'SDKROOT': '<(skia_osx_sdkroot)', # -isysroot
366 }],
367 ],
368 # trying to get this to work, but it needs clang I think... 352 # trying to get this to work, but it needs clang I think...
369 # 'WARNING_CFLAGS': '-Wexit-time-destructors', 353 # 'WARNING_CFLAGS': '-Wexit-time-destructors',
370 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', 354 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO',
371 'GCC_WARN_64_TO_32_BIT_CONVERSION': 'YES', 355 'GCC_WARN_64_TO_32_BIT_CONVERSION': 'YES',
372 'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'YES', 356 'GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS': 'YES',
373 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'YES', 357 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'YES',
374 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', 358 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',
375 'GCC_WARN_ABOUT_MISSING_PROTOTYPES': 'YES', 359 'GCC_WARN_ABOUT_MISSING_PROTOTYPES': 'YES',
376 'GCC_WARN_ABOUT_POINTER_SIGNEDNESS': 'YES', 360 'GCC_WARN_ABOUT_POINTER_SIGNEDNESS': 'YES',
377 'GCC_WARN_ABOUT_RETURN_TYPE': 'YES', 361 'GCC_WARN_ABOUT_RETURN_TYPE': 'YES',
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 'defines': [ 468 'defines': [
485 'SK_USE_POSIX_THREADS', 469 'SK_USE_POSIX_THREADS',
486 ], 470 ],
487 }], 471 }],
488 ], # end 'conditions' 472 ], # end 'conditions'
489 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details 473 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
490 'xcode_settings': { 474 'xcode_settings': {
491 'SYMROOT': '<(DEPTH)/xcodebuild', 475 'SYMROOT': '<(DEPTH)/xcodebuild',
492 }, 476 },
493 } 477 }
OLDNEW
« no previous file with comments | « no previous file | src/views/mac/SkNSView.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698