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

Side by Side Diff: gyp/tools.gyp

Issue 1206333002: Fix link error when running `make tools` with skia_shared_lib=1 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 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 | « 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 # Copyright 2015 Google Inc. 1 # Copyright 2015 Google Inc.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # GYP file to build various tools. 5 # GYP file to build various tools.
6 # 6 #
7 # To build on Linux: 7 # To build on Linux:
8 # ./gyp_skia tools.gyp && make tools 8 # ./gyp_skia tools.gyp && make tools
9 # 9 #
10 { 10 {
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 'tools.gyp:picture_utils', 182 'tools.gyp:picture_utils',
183 ], 183 ],
184 'cflags': [ 184 'cflags': [
185 '-O3', 185 '-O3',
186 ], 186 ],
187 'conditions': [ 187 'conditions': [
188 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', { 188 [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
189 'link_settings': { 189 'link_settings': {
190 'libraries': [ 190 'libraries': [
191 '-lrt', 191 '-lrt',
192 '-pthread',
192 ], 193 ],
193 }, 194 },
194 }], 195 }],
195 ['skia_opencl', { 196 ['skia_opencl', {
196 'sources': [ 197 'sources': [
197 '../tools/skpdiff/SkCLImageDiffer.cpp', 198 '../tools/skpdiff/SkCLImageDiffer.cpp',
198 '../tools/skpdiff/SkDifferentPixelsMetric_opencl.cpp', 199 '../tools/skpdiff/SkDifferentPixelsMetric_opencl.cpp',
199 ], 200 ],
200 'conditions': [ 201 'conditions': [
201 [ 'skia_os == "mac"', { 202 [ 'skia_os == "mac"', {
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 'flags.gyp:flags', 772 'flags.gyp:flags',
772 'skia_lib.gyp:skia_lib', 773 'skia_lib.gyp:skia_lib',
773 'resources', 774 'resources',
774 ], 775 ],
775 }, 776 },
776 ], 777 ],
777 }, 778 },
778 ], 779 ],
779 ], 780 ],
780 } 781 }
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