| 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_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)', | 8 'SK_DISTANCEFIELD_FONTS=<(skia_distancefield_fonts)', |
| 9 ], | 9 ], |
| 10 'conditions' : [ | 10 'conditions' : [ |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 ], | 257 ], |
| 258 'defines': [ | 258 'defines': [ |
| 259 'SKIA_DLL', | 259 'SKIA_DLL', |
| 260 'SKIA_IMPLEMENTATION=1', | 260 'SKIA_IMPLEMENTATION=1', |
| 261 ], | 261 ], |
| 262 }], | 262 }], |
| 263 [ 'skia_os == "nacl"', { | 263 [ 'skia_os == "nacl"', { |
| 264 'defines': [ | 264 'defines': [ |
| 265 'SK_BUILD_FOR_NACL', | 265 'SK_BUILD_FOR_NACL', |
| 266 ], | 266 ], |
| 267 'variables': { |
| 268 'nacl_sdk_root': '<!(["echo", "${NACL_SDK_ROOT}"])', |
| 269 }, |
| 267 'link_settings': { | 270 'link_settings': { |
| 268 'libraries': [ | 271 'libraries': [ |
| 269 '-lppapi', | 272 '-lppapi', |
| 270 '-lppapi_cpp', | 273 '-lppapi_cpp', |
| 271 '-lnosys', | 274 '-lnosys', |
| 272 '-pthread', | 275 '-pthread', |
| 273 ], | 276 ], |
| 277 'ldflags': [ |
| 278 '-L<(nacl_sdk_root)/lib/newlib_x86_<(skia_arch_width)/Release', |
| 279 '-L<(nacl_sdk_root)/ports/lib/newlib_x86_<(skia_arch_width)/Rele
ase', |
| 280 ], |
| 274 }, | 281 }, |
| 275 }, { # skia_os != "nacl" | 282 }, { # skia_os != "nacl" |
| 276 'link_settings': { | 283 'link_settings': { |
| 277 'ldflags': [ | 284 'ldflags': [ |
| 278 '-lstdc++', | 285 '-lstdc++', |
| 279 '-lm', | 286 '-lm', |
| 280 ], | 287 ], |
| 281 }, | 288 }, |
| 282 }], | 289 }], |
| 283 [ 'skia_os != "chromeos"', { | 290 [ 'skia_os != "chromeos"', { |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 516 'defines': [ | 523 'defines': [ |
| 517 'SK_USE_POSIX_THREADS', | 524 'SK_USE_POSIX_THREADS', |
| 518 ], | 525 ], |
| 519 }], | 526 }], |
| 520 ], # end 'conditions' | 527 ], # end 'conditions' |
| 521 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details | 528 # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for
more details |
| 522 'xcode_settings': { | 529 'xcode_settings': { |
| 523 'SYMROOT': '<(DEPTH)/xcodebuild', | 530 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 524 }, | 531 }, |
| 525 } | 532 } |
| OLD | NEW |