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

Unified Diff: third_party/mesa/mesa.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 | « third_party/khronos/khronos.gyp ('k') | tools/generate_shim_headers/generate_shim_headers.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/mesa/mesa.gyp
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
index 5334e528ee717889b1d643f573573f530af6188e..6a905b06e972271b8be96a302f1fbe58c21540a1 100644
--- a/third_party/mesa/mesa.gyp
+++ b/third_party/mesa/mesa.gyp
@@ -7,8 +7,6 @@
# Disable warnings as errors for mesa until they're fixed or disabled.
# http://crbug.com/143877
'win_third_party_warn_as_error': 'false',
-
- 'use_system_mesa%': 0,
},
'conditions': [
['use_system_mesa==0', {
@@ -592,6 +590,32 @@
{
'target_name': 'mesa_headers',
'type': 'none',
+ 'variables': {
+ 'headers_root_path': 'MesaLib/include',
+ # This list can easily be updated using the command below:
+ # find third_party/mesa/MesaLib/include -iname '*.h' \
+ # -printf "'%p',\n" | grep -v internal | sed -e \
+ # 's|third_party/mesa/MesaLib/include/||' | sort -u
+ 'header_filenames': [
+ 'GL/glext.h',
+ 'GL/glfbdev.h',
+ 'GL/gl.h',
+ 'GL/gl_mangle.h',
+ 'GL/glu.h',
+ 'GL/glu_mangle.h',
+ 'GL/glxext.h',
+ 'GL/glx.h',
+ 'GL/glx_mangle.h',
+ 'GL/mesa_wgl.h',
+ 'GL/osmesa.h',
+ 'GL/vms_x_fix.h',
+ 'GL/wglext.h',
+ 'GL/wmesa.h',
+ ],
+ },
+ 'includes': [
+ '../../build/shim_headers.gypi',
+ ],
},
{
'target_name': 'mesa',
« no previous file with comments | « third_party/khronos/khronos.gyp ('k') | tools/generate_shim_headers/generate_shim_headers.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698