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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/gl/gl.gyp

Issue 7011032: Make the gyp files more cross-platform across the Unices (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: updated to trunk and added spaces, collapsed one check Created 9 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
« chrome/chrome_tests.gypi ('K') | « ui/gfx/compositor/compositor.gyp ('k') | ui/gfx/surface/surface.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/gl/gl.gyp
diff --git a/ui/gfx/gl/gl.gyp b/ui/gfx/gl/gl.gyp
index 83acee44f9592d3bbc1c00304734f3e407f3e63f..da520bdd2fe726ee00f45dc952a9439b0033143f 100644
--- a/ui/gfx/gl/gl.gyp
+++ b/ui/gfx/gl/gl.gyp
@@ -10,7 +10,7 @@
['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
+ ['toolkit_uses_gtk == 1', {'sources/': [
['include', '/gtk/'],
['include', '_(gtk|linux|posix|skia|x)\\.cc$'],
['include', '/(gtk|x11)_[^/]*\\.cc$'],
@@ -123,7 +123,7 @@
},
],
'conditions': [
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="win"', {
+ ['OS != "mac"', {
'sources': [
'egl_util.cc',
'egl_util.h',
@@ -138,7 +138,7 @@
'<(DEPTH)/third_party/angle/include',
],
}],
- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+ ['use_x11 == 1', {
'sources': [
'gl_context_glx.cc',
'gl_context_glx.h',
« chrome/chrome_tests.gypi ('K') | « ui/gfx/compositor/compositor.gyp ('k') | ui/gfx/surface/surface.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698