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

Unified Diff: gyp/viewer.gyp

Issue 1999213002: Add Xlib support to viewer (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove viewer hack Created 4 years, 7 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 | « no previous file | include/gpu/vk/GrVkBackendContext.h » ('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 84daa8d4c5486c0dd0e4063b816e434b9ebf4f4b..1013e070ae0c9bd043c3100232e8a08bd8edd317 100644
--- a/gyp/viewer.gyp
+++ b/gyp/viewer.gyp
@@ -25,11 +25,13 @@
'../src/gpu',
'../src/images',
'../src/image',
+ '../src/views/unix',
'../tools/timer',
],
'sources': [
'../gm/gm.cpp',
'../src/views/SkTouchGesture.cpp',
+ '../src/views/unix/keysym2ucs.c',
'<!@(python find.py ../tools/viewer "*.cpp")',
],
'dependencies': [
@@ -56,10 +58,23 @@
],
},
}],
+ [ 'skia_os == "linux"', {
+ 'link_settings': {
+ 'libraries': [
+ '-lX11-xcb',
+ ],
+ },
+ }],
['skia_os != "android"', {
'sources/': [ ['exclude', '_android.(h|cpp)$'],
],
}],
+ ['skia_os != "linux"', {
+ 'sources/': [
+ ['exclude', '_unix.(h|cpp)$'],
+ ['exclude', 'keysym2ucs.c'],
+ ],
+ }],
['skia_os != "win"', {
'sources/': [ ['exclude', '_win.(h|cpp)$'],
],
« no previous file with comments | « no previous file | include/gpu/vk/GrVkBackendContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698