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

Side by Side Diff: gyp/gpu.gyp

Issue 599493003: Revert "Add support for EGL on linux" (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 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 unified diff | Download patch
« no previous file with comments | « gyp/common_variables.gypi ('k') | gyp/gpu.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # GYP for building gpu 1 # GYP for building gpu
2 { 2 {
3 'target_defaults': { 3 'target_defaults': {
4 'conditions': [ 4 'conditions': [
5 ['skia_os != "win"', { 5 ['skia_os != "win"', {
6 'sources/': [ ['exclude', '_win.(h|cpp)$'], 6 'sources/': [ ['exclude', '_win.(h|cpp)$'],
7 ], 7 ],
8 }], 8 }],
9 ['skia_os != "mac"', { 9 ['skia_os != "mac"', {
10 'sources/': [ ['exclude', '_mac.(h|cpp|m|mm)$'], 10 'sources/': [ ['exclude', '_mac.(h|cpp|m|mm)$'],
11 ], 11 ],
12 }], 12 }],
13 ['skia_os != "linux" and skia_os != "chromeos"', { 13 ['skia_os != "linux" and skia_os != "chromeos"', {
14 'sources/': [ ['exclude', '_unix.(h|cpp)$'], 14 'sources/': [ ['exclude', '_unix.(h|cpp)$'],
15 ['exclude', 'GrGLCreateNativeInterface_egl.cpp'],
16 ], 15 ],
17 }], 16 }],
18 ['skia_os != "ios"', { 17 ['skia_os != "ios"', {
19 'sources/': [ ['exclude', '_iOS.(h|cpp|m|mm)$'], 18 'sources/': [ ['exclude', '_iOS.(h|cpp|m|mm)$'],
20 ], 19 ],
21 }], 20 }],
22 ['skia_os != "android"', { 21 ['skia_os != "android"', {
23 'sources/': [ ['exclude', '_android.(h|cpp)$'], 22 'sources/': [ ['exclude', '_android.(h|cpp)$'],
24 ], 23 ],
25 }], 24 }],
26 ['skia_os != "nacl"', { 25 ['skia_os != "nacl"', {
27 'sources/': [ ['exclude', '_nacl.(h|cpp)$'], 26 'sources/': [ ['exclude', '_nacl.(h|cpp)$'],
28 ], 27 ],
29 }], 28 }],
30 ['skia_os == "nacl" or skia_egl == 0', {
31 'sources/': [ ['exclude', '_egl.(h|cpp)$'],
32 ],
33 }],
34 ['skia_egl == 1', {
35 'sources/': [ ['exclude', '_unix.(h|cpp)$'],
36 ],
37 }],
38 # nullify the targets in this gyp file if skia_gpu is 0 29 # nullify the targets in this gyp file if skia_gpu is 0
39 [ 'skia_gpu == 0', { 30 [ 'skia_gpu == 0', {
40 'sources/': [ 31 'sources/': [
41 ['exclude', '.*'], 32 ['exclude', '.*'],
42 ], 33 ],
43 'defines/': [ 34 'defines/': [
44 ['exclude', '.*'], 35 ['exclude', '.*'],
45 ], 36 ],
46 'include_dirs/': [ 37 'include_dirs/': [
47 ['exclude', '.*'], 38 ['exclude', '.*'],
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 ], 133 ],
143 'defines': [ 134 'defines': [
144 'GR_CHROME_UTILS=1', 135 'GR_CHROME_UTILS=1',
145 ], 136 ],
146 }], 137 }],
147 [ 'skia_os == "linux" or skia_os == "chromeos"', { 138 [ 'skia_os == "linux" or skia_os == "chromeos"', {
148 'sources!': [ 139 'sources!': [
149 '../src/gpu/gl/GrGLDefaultInterface_none.cpp', 140 '../src/gpu/gl/GrGLDefaultInterface_none.cpp',
150 '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp', 141 '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
151 ], 142 ],
152 }],
153 [ '(skia_os == "linux" or skia_os == "chromeos") and skia_egl == 1', {
154 'link_settings': {
155 'libraries': [
156 '-lEGL',
157 '-lGLESv2',
158 ],
159 },
160 }],
161 [ '(skia_os == "linux" or skia_os == "chromeos") and skia_egl == 0', {
162 'link_settings': { 143 'link_settings': {
163 'libraries': [ 144 'libraries': [
164 '-lGL', 145 '-lGL',
165 '-lGLU', 146 '-lGLU',
166 '-lX11', 147 '-lX11',
167 ], 148 ],
168 }, 149 },
169 }], 150 }],
170 [ 'skia_os == "nacl"', { 151 [ 'skia_os == "nacl"', {
171 'link_settings': { 152 'link_settings': {
172 'libraries': [ 153 'libraries': [
173 '-lppapi_gles2', 154 '-lppapi_gles2',
174 ], 155 ],
175 }, 156 },
176 }], 157 }],
177 [ 'skia_egl==1', {
178 'defines': [
179 'SK_EGL',
180 ],
181 }],
182 [ 'skia_mesa and skia_os == "linux"', { 158 [ 'skia_mesa and skia_os == "linux"', {
183 'link_settings': { 159 'link_settings': {
184 'libraries': [ 160 'libraries': [
185 '-lOSMesa', 161 '-lOSMesa',
186 ], 162 ],
187 }, 163 },
188 }], 164 }],
189 [ 'skia_os == "mac"', { 165 [ 'skia_os == "mac"', {
190 'link_settings': { 166 'link_settings': {
191 'libraries': [ 167 'libraries': [
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 'libraries': [ 219 'libraries': [
244 '-lGLESv2', 220 '-lGLESv2',
245 '-lEGL', 221 '-lEGL',
246 ], 222 ],
247 }, 223 },
248 }], 224 }],
249 ], 225 ],
250 }, 226 },
251 ], 227 ],
252 } 228 }
OLDNEW
« no previous file with comments | « gyp/common_variables.gypi ('k') | gyp/gpu.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698