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

Side by Side Diff: ui/gfx/gl/gl.gyp

Issue 7467007: Adding Wayland support for ui/gfx (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Accidentally pulled in some extra changes in common.gypi Created 9 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 9
10 'targets': [ 10 'targets': [
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 'gl_interface.cc', 51 'gl_interface.cc',
52 'gl_interface.h', 52 'gl_interface.h',
53 'gl_share_group.cc', 53 'gl_share_group.cc',
54 'gl_share_group.h', 54 'gl_share_group.h',
55 'gl_surface.cc', 55 'gl_surface.cc',
56 'gl_surface.h', 56 'gl_surface.h',
57 'gl_surface_linux.cc', 57 'gl_surface_linux.cc',
58 'gl_surface_mac.cc', 58 'gl_surface_mac.cc',
59 'gl_surface_stub.cc', 59 'gl_surface_stub.cc',
60 'gl_surface_stub.h', 60 'gl_surface_stub.h',
61 'gl_surface_wayland.cc',
sky 2011/07/27 15:51:05 Does this need to be excluded if wayland isn't def
61 'gl_surface_win.cc', 62 'gl_surface_win.cc',
62 'gl_surface_osmesa.cc', 63 'gl_surface_osmesa.cc',
63 'gl_surface_osmesa.h', 64 'gl_surface_osmesa.h',
64 'gl_switches.cc', 65 'gl_switches.cc',
65 'gl_switches.h', 66 'gl_switches.h',
66 '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc', 67 '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc',
67 '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h', 68 '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h',
68 '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc', 69 '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc',
69 '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc', 70 '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc',
70 '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h', 71 '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h',
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 'sources': [ 106 'sources': [
106 'egl_util.cc', 107 'egl_util.cc',
107 'egl_util.h', 108 'egl_util.h',
108 'gl_context_egl.cc', 109 'gl_context_egl.cc',
109 'gl_context_egl.h', 110 'gl_context_egl.h',
110 'gl_surface_egl.cc', 111 'gl_surface_egl.cc',
111 'gl_surface_egl.h', 112 'gl_surface_egl.h',
112 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', 113 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',
113 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', 114 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h',
114 ], 115 ],
115 'include_dirs': [ 116 'conditions': [
116 '<(DEPTH)/third_party/angle/include', 117 ['use_wayland != 1', {
118 'include_dirs': [
119 '<(DEPTH)/third_party/angle/include',
120 ],
121 }],
117 ], 122 ],
118 }], 123 }],
119 ['use_x11 == 1', { 124 ['use_wayland == 1', {
125 'sources!': [
126 'gl_surface_linux.cc',
127 ],
128 }],
129 ['use_x11 == 1 and use_wayland != 1', {
120 'sources': [ 130 'sources': [
121 'gl_context_glx.cc', 131 'gl_context_glx.cc',
122 'gl_context_glx.h', 132 'gl_context_glx.h',
123 'gl_surface_glx.cc', 133 'gl_surface_glx.cc',
124 'gl_surface_glx.h', 134 'gl_surface_glx.h',
125 '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc', 135 '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc',
126 '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h', 136 '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h',
127 ], 137 ],
128 'all_dependent_settings': { 138 'all_dependent_settings': {
129 'defines': [ 139 'defines': [
(...skipping 21 matching lines...) Expand all
151 'link_settings': { 161 'link_settings': {
152 'libraries': [ 162 'libraries': [
153 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', 163 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
154 ], 164 ],
155 }, 165 },
156 }], 166 }],
157 ], 167 ],
158 }, 168 },
159 ], 169 ],
160 } 170 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698