| OLD | NEW |
| 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_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', | 8 'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)', |
| 9 ], | 9 ], |
| 10 'conditions' : [ | 10 'conditions' : [ |
| (...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 327 'defines': [ | 327 'defines': [ |
| 328 'SKIA_DLL', | 328 'SKIA_DLL', |
| 329 'SKIA_IMPLEMENTATION=1', | 329 'SKIA_IMPLEMENTATION=1', |
| 330 ], | 330 ], |
| 331 }], | 331 }], |
| 332 [ 'skia_os == "nacl"', { | 332 [ 'skia_os == "nacl"', { |
| 333 'defines': [ | 333 'defines': [ |
| 334 'SK_BUILD_FOR_NACL', | 334 'SK_BUILD_FOR_NACL', |
| 335 ], | 335 ], |
| 336 'variables': { | 336 'variables': { |
| 337 'nacl_sdk_root': '<!(["echo", "${NACL_SDK_ROOT}"])', | 337 'nacl_sdk_root': '<!(echo ${NACL_SDK_ROOT})', |
| 338 }, | 338 }, |
| 339 'link_settings': { | 339 'link_settings': { |
| 340 'libraries': [ | 340 'libraries': [ |
| 341 '-lppapi', | 341 '-lppapi', |
| 342 '-lppapi_cpp', | 342 '-lppapi_cpp', |
| 343 '-lnosys', | 343 '-lnosys', |
| 344 '-pthread', | 344 '-pthread', |
| 345 ], | 345 ], |
| 346 'ldflags': [ | 346 'ldflags': [ |
| 347 '-L<(nacl_sdk_root)/lib/newlib_x86_<(skia_arch_width)/Release', | 347 '-L<(nacl_sdk_root)/lib/newlib_x86_<(skia_arch_width)/Release', |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 595 'defines': [ | 595 'defines': [ |
| 596 'SK_USE_POSIX_THREADS', | 596 'SK_USE_POSIX_THREADS', |
| 597 ], | 597 ], |
| 598 }], | 598 }], |
| 599 ], # end 'conditions' | 599 ], # end 'conditions' |
| 600 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 600 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 601 'xcode_settings': { | 601 'xcode_settings': { |
| 602 'SYMROOT': '<(DEPTH)/xcodebuild', | 602 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 603 }, | 603 }, |
| 604 } | 604 } |
| OLD | NEW |