diff options
| author | skyostil@google.com <skyostil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 13:29:37 +0000 |
|---|---|---|
| committer | skyostil@google.com <skyostil@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-24 13:29:37 +0000 |
| commit | 7102690b3ba3e8ffe9a4c19de81f9c572b20d03c (patch) | |
| tree | 382078fee9ae88baa1b06ff13602825e608309e9 /ppapi/native_client | |
| parent | 7861444e22bcc516c3f8628d9075c4ca68db4a95 (diff) | |
| download | chromium_src-7102690b3ba3e8ffe9a4c19de81f9c572b20d03c.zip chromium_src-7102690b3ba3e8ffe9a4c19de81f9c572b20d03c.tar.gz chromium_src-7102690b3ba3e8ffe9a4c19de81f9c572b20d03c.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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=111170
Review URL: http://codereview.chromium.org/8423038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
| -rw-r--r-- | ppapi/native_client/src/shared/ppapi_proxy/nacl.scons | 2 | ||||
| -rw-r--r-- | ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/nacl.scons b/ppapi/native_client/src/shared/ppapi_proxy/nacl.scons index 5093c7a..998e5cd 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/nacl.scons +++ b/ppapi/native_client/src/shared/ppapi_proxy/nacl.scons @@ -12,7 +12,7 @@ Dir('.').addRepository(Dir('#/../gpu')) # client GPU command buffer sources. env.Append(CPPPATH= ['${SOURCE_ROOT}/native_client/src/shared/ppapi_proxy/untrusted', - '$SOURCE_ROOT/gpu']) + '$SOURCE_ROOT/third_party/khronos', '$SOURCE_ROOT/gpu']) env.Append(CPPDEFINES=['XP_UNIX']) env.FilterOut(CCFLAGS=['-Wswitch-enum']) diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp index 26ff85e..4686b9b 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp +++ b/ppapi/native_client/src/shared/ppapi_proxy/ppapi_proxy.gyp @@ -80,6 +80,7 @@ 'build_newlib': 1, 'include_dirs': [ '<(DEPTH)/gpu', + '<(DEPTH)/third_party/khronos', '<(DEPTH)/ppapi/native_client/src/shared/ppapi_proxy/untrusted', ], 'sources': [ |