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

Side by Side Diff: gyp/dm.gyp

Issue 303913002: In Android framework, make tools depend on jsoncpp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase, cleanups. Created 6 years, 6 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 | « gyp/common_variables.gypi ('k') | gyp/gm.gyp » ('j') | gyp/gm.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # GYP for "dm" (Diamond Master, a.k.a Dungeon master, a.k.a GM 2). 1 # GYP for "dm" (Diamond Master, a.k.a Dungeon master, a.k.a GM 2).
2 # vim: set expandtab tabstop=4 shiftwidth=4 2 # vim: set expandtab tabstop=4 shiftwidth=4
3 { 3 {
4 'includes': [ 'apptype_console.gypi' ], 4 'includes': [ 'apptype_console.gypi' ],
5 5
6 'targets': [{ 6 'targets': [{
7 'target_name': 'dm', 7 'target_name': 'dm',
8 'type': 'executable', 8 'type': 'executable',
9 'include_dirs': [ 9 'include_dirs': [
10 '../bench', 10 '../bench',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 'dependencies': [ 57 'dependencies': [
58 'skia_lib.gyp:skia_lib', 58 'skia_lib.gyp:skia_lib',
59 'flags.gyp:flags', 59 'flags.gyp:flags',
60 'jsoncpp.gyp:jsoncpp', 60 'jsoncpp.gyp:jsoncpp',
61 'gputest.gyp:skgputest', 61 'gputest.gyp:skgputest',
62 'record.gyp:*', 62 'record.gyp:*',
63 'etc1.gyp:libetc1', 63 'etc1.gyp:libetc1',
64 ], 64 ],
65 'conditions': [ 65 'conditions': [
66 ['skia_android_framework', { 66 ['skia_android_framework', {
67 'libraries': [ '-lskia' ], 67 'libraries': [ '-lskia' , 'jsoncpp.a' ],
68 }], 68 }],
69 ['skia_poppler_enabled', { 69 ['skia_poppler_enabled', {
70 'sources': [ '../src/utils/SkPDFRasterizer.cpp' ], 70 'sources': [ '../src/utils/SkPDFRasterizer.cpp' ],
71 'defines': [ 'SK_BUILD_POPPLER' ], 71 'defines': [ 'SK_BUILD_POPPLER' ],
72 'dependencies': [ 'poppler.gyp:*' ], 72 'dependencies': [ 'poppler.gyp:*' ],
73 }], 73 }],
74 ], 74 ],
75 }] 75 }]
76 } 76 }
OLDNEW
« no previous file with comments | « gyp/common_variables.gypi ('k') | gyp/gm.gyp » ('j') | gyp/gm.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698