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

Side by Side Diff: gyp/tools.gyp

Issue 371853005: Move threadpool code from include/utils to tools/threadpool. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: gyp Created 6 years, 5 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/tests.gyp ('k') | gyp/utils.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # GYP file to build various tools. 1 # GYP file to build various tools.
2 # 2 #
3 # To build on Linux: 3 # To build on Linux:
4 # ./gyp_skia tools.gyp && make tools 4 # ./gyp_skia tools.gyp && make tools
5 # 5 #
6 { 6 {
7 'includes': [ 7 'includes': [
8 'apptype_console.gypi', 8 'apptype_console.gypi',
9 ], 9 ],
10 'targets': [ 10 'targets': [
(...skipping 26 matching lines...) Expand all
37 'conditions': [ 37 'conditions': [
38 ['skia_shared_lib', 38 ['skia_shared_lib',
39 { 39 {
40 'dependencies': [ 40 'dependencies': [
41 'sklua', # This can only be built if skia is built as a shared lib rary 41 'sklua', # This can only be built if skia is built as a shared lib rary
42 ], 42 ],
43 }, 43 },
44 ], 44 ],
45 ], 45 ],
46 }, 46 },
47 {
48 'target_name': 'threadpool',
49 'type': 'static_library',
50 'include_dirs': [ '../tools/threadpool' ],
51 'dependencies': [ 'skia_lib.gyp:skia_lib' ],
52 'sources': [
53 '../tools/threadpool/CondVar.cpp',
54 ],
55 'direct_dependent_settings': {
56 'include_dirs': [ '../tools/threadpool' ],
57 },
58 },
59
47 { # This would go in gm.gyp, but it's also used by skimage below. 60 { # This would go in gm.gyp, but it's also used by skimage below.
48 'target_name': 'gm_expectations', 61 'target_name': 'gm_expectations',
49 'type': 'static_library', 62 'type': 'static_library',
50 'include_dirs' : [ '../src/utils/' ], 63 'include_dirs' : [ '../src/utils/' ],
51 'sources': [ 64 'sources': [
52 '../gm/gm_expectations.cpp', 65 '../gm/gm_expectations.cpp',
53 ], 66 ],
54 'dependencies': [ 67 'dependencies': [
55 'jsoncpp.gyp:jsoncpp', 68 'jsoncpp.gyp:jsoncpp',
56 'sk_tool_utils', 69 'sk_tool_utils',
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 '../tools/skpdiff/SkImageDiffer.cpp', 176 '../tools/skpdiff/SkImageDiffer.cpp',
164 '../tools/skpdiff/SkPMetric.cpp', 177 '../tools/skpdiff/SkPMetric.cpp',
165 '../tools/skpdiff/skpdiff_util.cpp', 178 '../tools/skpdiff/skpdiff_util.cpp',
166 ], 179 ],
167 'include_dirs': [ 180 'include_dirs': [
168 '../src/core/', # needed for SkTLList.h 181 '../src/core/', # needed for SkTLList.h
169 ], 182 ],
170 'dependencies': [ 183 'dependencies': [
171 'flags.gyp:flags', 184 'flags.gyp:flags',
172 'skia_lib.gyp:skia_lib', 185 'skia_lib.gyp:skia_lib',
186 'tools.gyp:threadpool',
173 ], 187 ],
174 'cflags': [ 188 'cflags': [
175 '-O3', 189 '-O3',
176 ], 190 ],
177 'conditions': [ 191 'conditions': [
178 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { 192 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
179 'link_settings': { 193 'link_settings': {
180 'libraries': [ 194 'libraries': [
181 '-lrt', 195 '-lrt',
182 ], 196 ],
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 'type': 'executable', 727 'type': 'executable',
714 'sources': [ 728 'sources': [
715 '../tools/win_lcid.cpp', 729 '../tools/win_lcid.cpp',
716 ], 730 ],
717 }, 731 },
718 ], 732 ],
719 }, 733 },
720 ], 734 ],
721 ], 735 ],
722 } 736 }
OLDNEW
« no previous file with comments | « gyp/tests.gyp ('k') | gyp/utils.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698