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

Unified Diff: experimental/skpdiff/skpdiff.gyp

Issue 19374006: make OpenCL optional for skpdiff (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: this-> Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « experimental/skpdiff/main.cpp ('k') | experimental/skpdiff/skpdiff_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: experimental/skpdiff/skpdiff.gyp
diff --git a/experimental/skpdiff/skpdiff.gyp b/experimental/skpdiff/skpdiff.gyp
index 39e4094fe3bae7dfb916edfd835bd987af740e16..8083f77ccd67e13181683da19888bf70990bfa45 100644
--- a/experimental/skpdiff/skpdiff.gyp
+++ b/experimental/skpdiff/skpdiff.gyp
@@ -12,7 +12,6 @@
'main.cpp',
'SkDiffContext.cpp',
'SkImageDiffer.cpp',
- 'SkCLImageDiffer.cpp',
'SkPMetric.cpp',
'skpdiff_util.cpp',
'../../tools/flags/SkCommandLineFlags.cpp',
@@ -26,15 +25,25 @@
'cflags': [
'-O3',
],
- 'link_settings': {
- 'libraries': [
- '-lOpenCL',
- ],
- },
+ 'conditions': [
+ ['skia_opencl', {
+ 'sources': [
+ 'SkCLImageDiffer.cpp',
+ 'SkDifferentPixelsMetric_opencl.cpp',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '-lOpenCL',
+ ],
+ },
+ }, {
+ 'sources': [
+ 'SkDifferentPixelsMetric_cpu.cpp',
+ ],
+ }],
+ ],
},
],
- 'conditions': [
- ],
}
# Local Variables:
« no previous file with comments | « experimental/skpdiff/main.cpp ('k') | experimental/skpdiff/skpdiff_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698