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

Unified Diff: gyp/views.gyp

Issue 1428633003: Wire up SDL on mac (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: tweaks Created 5 years, 1 month 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/common_conditions.gypi ('k') | src/views/sdl/SkOSWindow_SDL.cpp » ('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 f8ccf51903e1af27c85d6590ee1aefd9b147c294..1130e669d37ec9105ec2ee3e60c578fb10361b5c 100644
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -86,7 +86,7 @@
'../src/gpu',
],
}],
- [ 'skia_os == "mac"', {
+ [ 'skia_os == "mac" and skia_use_sdl == 0', {
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
@@ -107,7 +107,7 @@
'../src/views/mac/skia_mac.mm',
],
}],
- [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
+ [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"] and skia_use_sdl == 0', {
'link_settings': {
'libraries': [
'-lGL',
@@ -142,9 +142,20 @@
'sdl.gyp:sdl',
],
'sources!': [
- '../src/views/unix/SkOSWindow_Unix.cpp',
- '../src/views/unix/keysym2ucs.c',
- '../src/views/unix/skia_unix.cpp',
+ # linux sources
+ '../src/views/unix/SkOSWindow_Unix.cpp',
+ '../src/views/unix/keysym2ucs.c',
+ '../src/views/unix/skia_unix.cpp',
+
+ # mac sources
+ '../src/views/mac/SkEventNotifier.h',
+ '../src/views/mac/SkEventNotifier.mm',
+ '../src/views/mac/SkTextFieldCell.h',
+ '../src/views/mac/SkTextFieldCell.m',
+ '../src/views/mac/SkNSView.h',
+ '../src/views/mac/SkNSView.mm',
+ '../src/views/mac/SkOSWindow_Mac.mm',
+ '../src/views/mac/skia_mac.mm',
],
'sources': [
'../src/views/sdl/SkOSWindow_SDL.cpp',
@@ -152,6 +163,18 @@
'export_dependent_settings': [
'sdl.gyp:sdl',
],
+ 'conditions': [
+ [ 'skia_os == "mac"', {
+ 'include_dirs': [
+ '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework/Headers',
+ ],
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
+ ],
+ }
+ }],
+ ],
}],
],
'direct_dependent_settings': {
« no previous file with comments | « gyp/common_conditions.gypi ('k') | src/views/sdl/SkOSWindow_SDL.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698