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

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: Replaced the way WaylandDisplay is being retrieved Created 9 years, 5 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 23 matching lines...) Expand all
34 'gl_bindings_skia_in_process.cc', 34 'gl_bindings_skia_in_process.cc',
35 'gl_bindings_skia_in_process.h', 35 'gl_bindings_skia_in_process.h',
36 'gl_context.cc', 36 'gl_context.cc',
37 'gl_context.h', 37 'gl_context.h',
38 'gl_context_linux.cc', 38 'gl_context_linux.cc',
39 'gl_context_mac.cc', 39 'gl_context_mac.cc',
40 'gl_context_osmesa.cc', 40 'gl_context_osmesa.cc',
41 'gl_context_osmesa.h', 41 'gl_context_osmesa.h',
42 'gl_context_stub.cc', 42 'gl_context_stub.cc',
43 'gl_context_stub.h', 43 'gl_context_stub.h',
44 'gl_context_wayland.cc',
44 'gl_context_win.cc', 45 'gl_context_win.cc',
45 'gl_implementation.cc', 46 'gl_implementation.cc',
46 'gl_implementation.h', 47 'gl_implementation.h',
47 'gl_implementation_linux.cc', 48 'gl_implementation_linux.cc',
48 'gl_implementation_mac.cc', 49 'gl_implementation_mac.cc',
50 'gl_implementation_wayland.cc',
49 'gl_implementation_win.cc', 51 'gl_implementation_win.cc',
50 'gl_interface.cc', 52 'gl_interface.cc',
51 'gl_interface.h', 53 'gl_interface.h',
52 'gl_share_group.cc', 54 'gl_share_group.cc',
53 'gl_share_group.h', 55 'gl_share_group.h',
54 'gl_surface.cc', 56 'gl_surface.cc',
55 'gl_surface.h', 57 'gl_surface.h',
56 'gl_surface_linux.cc', 58 'gl_surface_linux.cc',
57 'gl_surface_mac.cc', 59 'gl_surface_mac.cc',
58 'gl_surface_stub.cc', 60 'gl_surface_stub.cc',
59 'gl_surface_stub.h', 61 'gl_surface_stub.h',
62 'gl_surface_wayland.cc',
60 'gl_surface_win.cc', 63 'gl_surface_win.cc',
61 'gl_surface_osmesa.cc', 64 'gl_surface_osmesa.cc',
62 'gl_surface_osmesa.h', 65 'gl_surface_osmesa.h',
63 'gl_switches.cc', 66 'gl_switches.cc',
64 'gl_switches.h', 67 'gl_switches.h',
65 '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc', 68 '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc',
66 '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h', 69 '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h',
67 '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc', 70 '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc',
68 '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc', 71 '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc',
69 '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h', 72 '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h',
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 'sources': [ 107 'sources': [
105 'egl_util.cc', 108 'egl_util.cc',
106 'egl_util.h', 109 'egl_util.h',
107 'gl_context_egl.cc', 110 'gl_context_egl.cc',
108 'gl_context_egl.h', 111 'gl_context_egl.h',
109 'gl_surface_egl.cc', 112 'gl_surface_egl.cc',
110 'gl_surface_egl.h', 113 'gl_surface_egl.h',
111 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', 114 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',
112 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', 115 '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h',
113 ], 116 ],
114 'include_dirs': [ 117 'conditions': [
115 '<(DEPTH)/third_party/angle/include', 118 ['use_wayland != 1', {
119 'include_dirs': [
120 '<(DEPTH)/third_party/angle/include',
121 ],
122 }],
116 ], 123 ],
117 }], 124 }],
118 ['use_x11 == 1', { 125 ['use_wayland == 1', {
126 'sources/': [
127 ['exclude', '_(linux)\\.cc$'],
128 ],
129 }, {
130 'sources/': [
131 ['exclude', '_(wayland)\\.cc$'],
132 ],
133 }],
jonathan.backer 2011/07/26 14:56:27 My understanding is that setting chromium_code to
134 ['use_x11 == 1 and use_wayland != 1', {
119 'sources': [ 135 'sources': [
120 'gl_context_glx.cc', 136 'gl_context_glx.cc',
121 'gl_context_glx.h', 137 'gl_context_glx.h',
122 'gl_surface_glx.cc', 138 'gl_surface_glx.cc',
123 'gl_surface_glx.h', 139 'gl_surface_glx.h',
124 '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc', 140 '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc',
125 '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h', 141 '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h',
126 ], 142 ],
127 'all_dependent_settings': { 143 'all_dependent_settings': {
128 'defines': [ 144 'defines': [
(...skipping 21 matching lines...) Expand all
150 'link_settings': { 166 'link_settings': {
151 'libraries': [ 167 'libraries': [
152 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', 168 '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
153 ], 169 ],
154 }, 170 },
155 }], 171 }],
156 ], 172 ],
157 }, 173 },
158 ], 174 ],
159 } 175 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698