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

Unified Diff: gyp/viewer.gyp

Issue 2067023002: Enable viewer in non-Vulkan builds (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Only include XCB if using Vulkan Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/most.gyp ('k') | tools/viewer/Viewer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/viewer.gyp
diff --git a/gyp/viewer.gyp b/gyp/viewer.gyp
index 012281a68ede5151270166237710570ef6b05e04..5bec25c756d7f6c7d56f335bf90e07c148c267da 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']
+ ],
+ }],
],
},
],
« no previous file with comments | « gyp/most.gyp ('k') | tools/viewer/Viewer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698