diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 03:55:22 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 03:55:22 +0000 |
| commit | 9ecad220ad03c147c0f75c3d167614eeffa7d0b2 (patch) | |
| tree | 82e968857feb5189452d4d9c40d4342cb2732c32 /third_party/mesa | |
| parent | 3e0c779babfc9e8848277277ceb1a7782d30de59 (diff) | |
| download | chromium_src-9ecad220ad03c147c0f75c3d167614eeffa7d0b2.zip chromium_src-9ecad220ad03c147c0f75c3d167614eeffa7d0b2.tar.gz chromium_src-9ecad220ad03c147c0f75c3d167614eeffa7d0b2.tar.bz2 | |
Linux: include system Mesa headers when using system Mesa.
BUG=161389
Review URL: https://chromiumcodereview.appspot.com/11416265
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mesa')
| -rw-r--r-- | third_party/mesa/include/osmesa.h | 18 | ||||
| -rw-r--r-- | third_party/mesa/mesa.gyp | 5 |
2 files changed, 23 insertions, 0 deletions
diff --git a/third_party/mesa/include/osmesa.h b/third_party/mesa/include/osmesa.h new file mode 100644 index 0000000..d727e90 --- /dev/null +++ b/third_party/mesa/include/osmesa.h @@ -0,0 +1,18 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef THIRD_PARTY_MESA_INCLUDE_OSMESA_H_ +#define THIRD_PARTY_MESA_INCLUDE_OSMESA_H_ +#pragma once + +// This is a shim header to include the right mesa header. +// Use this instead of referencing the mesa header directly. + +#if defined(USE_SYSTEM_MESA) +#include <GL/osmesa.h> +#else +#include "third_party/mesa/MesaLib/include/GL/osmesa.h" +#endif + +#endif // THIRD_PARTY_MESA_INCLUDE_OSMESA_H_ diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp index 5334e52..1271a0e 100644 --- a/third_party/mesa/mesa.gyp +++ b/third_party/mesa/mesa.gyp @@ -592,6 +592,11 @@ { 'target_name': 'mesa_headers', 'type': 'none', + 'direct_dependent_settings': { + 'defines': [ + 'USE_SYSTEM_MESA', + ], + } }, { 'target_name': 'mesa', |