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

Unified Diff: ui/gl/gl.gyp

Issue 11693007: Linux: use generated shim headers for system mesa. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes for windows Created 7 years, 11 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
« no previous file with comments | « ui/gl/generate_bindings.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl.gyp
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 89eb268e3fce726dbc1d184dc5348a1c56e47b1a..b4e74094e5719ed1732e3cda7fe53c11f2e58bce 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -118,14 +118,19 @@
'actions': [
{
'action_name': 'generate_gl_bindings',
+ 'variables': {
+ 'generator_path': 'generate_bindings.py',
+ 'conditions': [
+ ['use_system_mesa==0', {
+ 'header_paths': '../../third_party/mesa/MesaLib/include:../../third_party/khronos',
+ }, { # use_system_mesa==1
+ 'header_paths': '/usr/include',
+ }],
+ ],
+ },
'inputs': [
- 'generate_bindings.py',
- '<(DEPTH)/third_party/khronos/GLES2/gl2ext.h',
- '<(DEPTH)/third_party/khronos/EGL/eglext.h',
- '<(DEPTH)/third_party/mesa/MesaLib/include/GL/glext.h',
- '<(DEPTH)/third_party/mesa/MesaLib/include/GL/glx.h',
- '<(DEPTH)/third_party/mesa/MesaLib/include/GL/glxext.h',
- '<(DEPTH)/third_party/mesa/MesaLib/include/GL/wglext.h',
+ '<(generator_path)',
+ '<!@(python <(generator_path) --header-paths=<(header_paths) --inputs)',
],
'outputs': [
'<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc',
@@ -157,7 +162,8 @@
],
'action': [
'python',
- 'generate_bindings.py',
+ '<(generator_path)',
+ '--header-paths=<(header_paths)',
'<(gl_binding_output_dir)',
],
},
« no previous file with comments | « ui/gl/generate_bindings.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698