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

Side by Side Diff: gyp/common_conditions.gypi

Issue 23281003: Add libraries to fix Ubuntu13 Clang build (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 4 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 | « no previous file | no next file » | 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 ], 6 ],
7 'conditions' : [ 7 'conditions' : [
8 [ 'skia_gpu == 1', 8 [ 'skia_gpu == 1',
9 { 9 {
10 'defines': [ 10 'defines': [
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 'SK_BUILD_FOR_NACL', 240 'SK_BUILD_FOR_NACL',
241 ], 241 ],
242 'link_settings': { 242 'link_settings': {
243 'libraries': [ 243 'libraries': [
244 '-lppapi', 244 '-lppapi',
245 '-lppapi_cpp', 245 '-lppapi_cpp',
246 '-lnosys', 246 '-lnosys',
247 '-pthread', 247 '-pthread',
248 ], 248 ],
249 }, 249 },
250 }, {
djsollen 2013/08/19 18:02:10 can you comment that this is skia_os != "nacl"
borenet 2013/08/19 18:05:27 Done.
251 'link_settings': {
252 'ldflags': [
253 '-lstdc++',
254 '-lm',
255 ],
256 },
250 }], 257 }],
251 [ 'skia_os == "chromeos"', { 258 [ 'skia_os == "chromeos"', {
bungeman-skia 2013/08/19 18:05:32 Since this block seems to now be empty, shout this
borenet 2013/08/19 18:08:01 Done.
252 'ldflags': [
253 '-lstdc++',
254 '-lm',
255 ],
256 }, { 259 }, {
257 'conditions': [ 260 'conditions': [
258 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', { 261 [ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
259 'cflags': [ 262 'cflags': [
260 '-m64', 263 '-m64',
261 ], 264 ],
262 'ldflags': [ 265 'ldflags': [
263 '-m64', 266 '-m64',
264 ], 267 ],
265 }], 268 }],
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
479 'xcode_settings': { 482 'xcode_settings': {
480 'SYMROOT': '<(DEPTH)/xcodebuild', 483 'SYMROOT': '<(DEPTH)/xcodebuild',
481 }, 484 },
482 } 485 }
483 486
484 # Local Variables: 487 # Local Variables:
485 # tab-width:2 488 # tab-width:2
486 # indent-tabs-mode:nil 489 # indent-tabs-mode:nil
487 # End: 490 # End:
488 # vim: set expandtab tabstop=2 shiftwidth=2: 491 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698