diff options
| author | skyostil@google.com <skyostil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 17:26:19 +0000 |
|---|---|---|
| committer | skyostil@google.com <skyostil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 17:26:19 +0000 |
| commit | 8fcd0ee58318edc4e96732ba87426f9c356abbf0 (patch) | |
| tree | 258024dc374c4b60d77953115792d937718fbf22 /gpu/gpu.gyp | |
| parent | 8ea26c2868aa05a80b9f7fe6b39d9bd74ca9b46e (diff) | |
| download | chromium_src-8fcd0ee58318edc4e96732ba87426f9c356abbf0.zip chromium_src-8fcd0ee58318edc4e96732ba87426f9c356abbf0.tar.gz chromium_src-8fcd0ee58318edc4e96732ba87426f9c356abbf0.tar.bz2 | |
Move GL headers from gpu to third_party/khronos
This change moves the OpenGL ES and EGL header files from gpu/ to a new third_party/khronos/ directory. The headers are also rebased to the latest upstream versions.
BUG=102824
TEST=none
Review URL: http://codereview.chromium.org/8423038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index ab5650a..adbc241 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -30,11 +30,11 @@ 'target_name': 'command_buffer_common', 'type': 'static_library', 'include_dirs': [ - '.', + '<(DEPTH)/third_party/khronos', ], 'all_dependent_settings': { 'include_dirs': [ - '.', + '<(DEPTH)/third_party/khronos', ], }, 'dependencies': [ @@ -90,7 +90,7 @@ 'all_dependent_settings': { 'include_dirs': [ # For GLES2/gl2.h - '.', + '<(DEPTH)/third_party/khronos', ], }, 'sources': [ @@ -112,7 +112,7 @@ 'all_dependent_settings': { 'include_dirs': [ # For GLES2/gl2.h - '.', + '<(DEPTH)/third_party/khronos', ], }, 'sources': [ @@ -152,10 +152,12 @@ 'type': 'static_library', 'include_dirs': [ '..', + '<(DEPTH)/third_party/khronos', ], 'all_dependent_settings': { 'include_dirs': [ '..', + '<(DEPTH)/third_party/khronos', ], }, 'dependencies': [ @@ -177,10 +179,12 @@ 'type': 'static_library', 'include_dirs': [ '..', + '<(DEPTH)/third_party/khronos', ], 'all_dependent_settings': { 'include_dirs': [ '..', + '<(DEPTH)/third_party/khronos', ], }, 'dependencies': [ @@ -327,6 +331,7 @@ ], 'include_dirs': [ '..', + '<(DEPTH)/third_party/khronos', ], 'sources': [ 'command_buffer/common/gl_mock.h', @@ -345,6 +350,7 @@ ], 'include_dirs': [ '..', + '<(DEPTH)/third_party/khronos', ], 'sources': [ 'ipc/gpu_command_buffer_traits.cc', |