diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 07:03:35 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 07:03:35 +0000 |
| commit | 6637a92faaa89b333fff64063551d19f64322a9b (patch) | |
| tree | 169c25aae6da0e7a841352ff118d8d376edf65e1 /third_party/mesa | |
| parent | f363d90e4cea728058107ad86d9de1ebffbd9182 (diff) | |
| download | chromium_src-6637a92faaa89b333fff64063551d19f64322a9b.zip chromium_src-6637a92faaa89b333fff64063551d19f64322a9b.tar.gz chromium_src-6637a92faaa89b333fff64063551d19f64322a9b.tar.bz2 | |
Encapsulate mesa include paths in mesa.gyp,
instead of "hardcoding" it in gl.gyp. This is one of steps
towards use_system_mesa build option.
BUG=161389
Review URL: https://chromiumcodereview.appspot.com/11308060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/mesa')
| -rw-r--r-- | third_party/mesa/mesa.gyp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp index a7e475d..6f06764 100644 --- a/third_party/mesa/mesa.gyp +++ b/third_party/mesa/mesa.gyp @@ -35,16 +35,27 @@ }, 'targets': [ { + 'target_name': 'headers', + 'type': 'none', + 'direct_dependent_settings': { + 'include_dirs': [ + 'MesaLib/include', + ], + }, + }, + { 'target_name': 'mesa', 'type': 'static_library', 'include_dirs': [ '../talloc', - 'MesaLib/include', 'MesaLib/src/glsl', 'MesaLib/src/mapi', 'MesaLib/src/mesa', 'MesaLib/src/mesa/main', ], + 'dependencies': [ + 'headers', + ], 'sources': [ '../talloc/talloc.c', 'MesaLib/src/glsl/ast.h', @@ -545,6 +556,7 @@ 'type': 'loadable_module', 'mac_bundle': 0, 'dependencies': [ + 'headers', 'mesa', ], # Fixes link problems on Mac OS X with missing __cxa_pure_virtual. @@ -556,7 +568,6 @@ }], ], 'include_dirs': [ - 'MesaLib/include', 'MesaLib/src/mapi', 'MesaLib/src/mesa', 'MesaLib/src/mesa/drivers', |