diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 17:34:31 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 17:34:31 +0000 |
| commit | 46aa05cc4233d50f361375d11227648f232129d3 (patch) | |
| tree | 737aa4ce172841536196c0ae605b5bd17d78a480 /third_party/mesa | |
| parent | 4ebf2a9e3ab572b6b9d911c4d1058a4e5f8eafe5 (diff) | |
| download | chromium_src-46aa05cc4233d50f361375d11227648f232129d3.zip chromium_src-46aa05cc4233d50f361375d11227648f232129d3.tar.gz chromium_src-46aa05cc4233d50f361375d11227648f232129d3.tar.bz2 | |
Linux: use generated shim headers for system mesa.
BUG=161389, 165264
Review URL: https://codereview.chromium.org/11693007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mesa')
| -rw-r--r-- | third_party/mesa/mesa.gyp | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp index 5334e52..6a905b0 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', |