diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-28 01:08:58 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-28 01:08:58 +0000 |
| commit | ae2b0be000892f2c86aeb5a5aedb0ff4eb2d2063 (patch) | |
| tree | e41fd7519cf6491545c1a2750d534eb9ba7eb203 /third_party/mesa | |
| parent | 81ddd340119cc2f38b37c50b2283b80dab2cc9fb (diff) | |
| download | chromium_src-ae2b0be000892f2c86aeb5a5aedb0ff4eb2d2063.zip chromium_src-ae2b0be000892f2c86aeb5a5aedb0ff4eb2d2063.tar.gz chromium_src-ae2b0be000892f2c86aeb5a5aedb0ff4eb2d2063.tar.bz2 | |
Revert "Linux: include system Mesa headers when using system Mesa."
This reverts https://chromiumcodereview.appspot.com/11416265
Using generated shim headers will be much better.
TBR=apatrick
BUG=161389
Review URL: https://codereview.chromium.org/11697002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174715 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, 0 insertions, 23 deletions
diff --git a/third_party/mesa/include/osmesa.h b/third_party/mesa/include/osmesa.h deleted file mode 100644 index d727e90..0000000 --- a/third_party/mesa/include/osmesa.h +++ /dev/null @@ -1,18 +0,0 @@ -// 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 1271a0e..5334e52 100644 --- a/third_party/mesa/mesa.gyp +++ b/third_party/mesa/mesa.gyp @@ -592,11 +592,6 @@ { 'target_name': 'mesa_headers', 'type': 'none', - 'direct_dependent_settings': { - 'defines': [ - 'USE_SYSTEM_MESA', - ], - } }, { 'target_name': 'mesa', |