aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar jvanverth <jvanverth@google.com>2016-06-17 09:29:14 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-06-17 09:29:14 -0700
commit063ece71848fadc963cbac5c978cd48262138131 (patch)
tree5b4193a94f66ddf10ab75a51855a81db00060862 /gyp
parent960b2d69bbae19dc814f06d841b94ef71e291b48 (diff)
Enable viewer in non-Vulkan builds
Diffstat (limited to 'gyp')
-rw-r--r--gyp/most.gyp5
-rw-r--r--gyp/viewer.gyp6
2 files changed, 7 insertions, 4 deletions
diff --git a/gyp/most.gyp b/gyp/most.gyp
index 47c0d804da..eb9f6c00f4 100644
--- a/gyp/most.gyp
+++ b/gyp/most.gyp
@@ -27,7 +27,6 @@
'pathops_skpclip.gyp:*',
'dm.gyp:dm',
'fuzz.gyp:fuzz',
- 'viewer.gyp:viewer',
],
'conditions': [
[ 'skia_gpu == 0', {
@@ -62,8 +61,8 @@
'skiaserve.gyp:skiaserve',
],
}],
- [ 'skia_vulkan == 0 or (skia_os != "win" and skia_os != "android")', {
- 'dependencies!': [
+ [ 'skia_os in ["win", "linux", "android"]', {
+ 'dependencies': [
'viewer.gyp:viewer',
],
}],
diff --git a/gyp/viewer.gyp b/gyp/viewer.gyp
index 012281a68e..5bec25c756 100644
--- a/gyp/viewer.gyp
+++ b/gyp/viewer.gyp
@@ -78,7 +78,7 @@
],
},
}],
- [ 'skia_os == "linux"', {
+ [ 'skia_os == "linux" and skia_vulkan == 1', {
'link_settings': {
'libraries': [
'-lX11-xcb',
@@ -101,6 +101,10 @@
'sources/': [ ['exclude', '_win.(h|cpp)$'],
],
}],
+ ['skia_vulkan == 0', {
+ 'sources/': [ ['exclude', 'Vulkan']
+ ],
+ }],
],
},
],