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

Unified Diff: gyp/views.gyp

Issue 1413593007: Create SDL backed SkOSWindow (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: tweaks Created 5 years, 2 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/gl/SkGLContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/views.gyp
diff --git a/gyp/views.gyp b/gyp/views.gyp
index 83ce3775349964cf0f57cbdb946921bf3eb1f43a..bd8a60da25aef24847d69da85805092cad11a11c 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -9,6 +9,9 @@
# * Basic widgets and controls.
{
+ 'variables': {
+ 'skia_use_sdl%': 0,
+ },
'targets': [
{
'target_name': 'views',
@@ -60,6 +63,11 @@
'../src/views/SkViewPriv.h',
'../src/views/SkWidgets.cpp',
'../src/views/SkWindow.cpp',
+
+ # Unix
+ '../src/views/unix/SkOSWindow_Unix.cpp',
+ '../src/views/unix/keysym2ucs.c',
+ '../src/views/unix/skia_unix.cpp',
# Mac
'../src/views/mac/SkEventNotifier.h',
@@ -71,21 +79,9 @@
'../src/views/mac/SkOSWindow_Mac.mm',
'../src/views/mac/skia_mac.mm',
- # SDL
- '../src/views/sdl/SkOSWindow_SDL.cpp',
-
- # *nix
- '../src/views/unix/SkOSWindow_Unix.cpp',
- '../src/views/unix/keysym2ucs.c',
- '../src/views/unix/skia_unix.cpp',
-
# Windows
'../src/views/win/SkOSWindow_win.cpp',
'../src/views/win/skia_win.cpp',
-
- ],
- 'sources!' : [
- '../src/views/sdl/SkOSWindow_SDL.cpp',
],
'conditions': [
[ 'skia_gpu == 1', {
@@ -141,6 +137,25 @@
'../include/gpu',
],
}],
+ [ 'skia_use_sdl == 1', {
+ 'defines': [
+ 'SK_USE_SDL',
+ ],
+ 'dependencies': [
+ 'sdl.gyp:sdl',
+ ],
+ 'sources!': [
+ '../src/views/unix/SkOSWindow_Unix.cpp',
+ '../src/views/unix/keysym2ucs.c',
+ '../src/views/unix/skia_unix.cpp',
+ ],
+ 'sources': [
+ '../src/views/sdl/SkOSWindow_SDL.cpp',
+ ],
+ 'export_dependent_settings': [
+ 'sdl.gyp:sdl',
+ ],
+ }],
],
'direct_dependent_settings': {
'include_dirs': [
« no previous file with comments | « no previous file | include/gpu/gl/SkGLContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698