diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 00:31:48 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 00:31:48 +0000 |
| commit | 9ffb05d3f5d550c4c3219404bf41841bde3edc90 (patch) | |
| tree | 37652cef3351edd8399c2fcfeeee4a4a5ecb428f /gpu/gles2_conform_support | |
| parent | 0ed0b7e7673321d88c2aacdd1034086e138a6688 (diff) | |
| download | chromium_src-9ffb05d3f5d550c4c3219404bf41841bde3edc90.zip chromium_src-9ffb05d3f5d550c4c3219404bf41841bde3edc90.tar.gz chromium_src-9ffb05d3f5d550c4c3219404bf41841bde3edc90.tar.bz2 | |
Encapsulate khronos include paths in khronos.gyp,
instead of hardcoding it all over the place (literally).
This is one of the steps towards use_system_mesa build option.
BUG=161389
Review URL: https://chromiumcodereview.appspot.com/11416085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gles2_conform_support')
| -rw-r--r-- | gpu/gles2_conform_support/gles2_conform_support.gyp | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp index 54e5e58..ae4683a 100644 --- a/gpu/gles2_conform_support/gles2_conform_support.gyp +++ b/gpu/gles2_conform_support/gles2_conform_support.gyp @@ -30,14 +30,14 @@ 'target_name': 'egl_native', 'type': 'static_library', 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/gpu/gpu.gyp:gpu', - '<(DEPTH)/gpu/gpu.gyp:gles2_implementation_client_side_arrays_no_check', - '<(DEPTH)/gpu/gpu.gyp:command_buffer_service', - '<(DEPTH)/ui/gl/gl.gyp:gl', - '<(DEPTH)/ui/ui.gyp:ui', + '../../base/base.gyp:base', + '../../gpu/gpu.gyp:gpu', + '../../gpu/gpu.gyp:gles2_implementation_client_side_arrays_no_check', + '../../gpu/gpu.gyp:command_buffer_service', + '../../third_party/khronos/khronos.gyp:headers', + '../../ui/gl/gl.gyp:gl', + '../../ui/ui.gyp:ui', ], - 'include_dirs': ['<(DEPTH)/third_party/khronos'], 'sources': [ 'egl/config.cc', 'egl/config.h', @@ -47,9 +47,6 @@ 'egl/surface.cc', 'egl/surface.h', ], - 'direct_dependent_settings': { - 'include_dirs': ['<(DEPTH)/third_party/khronos'], - }, 'defines': [ 'EGLAPI=', 'EGLAPIENTRY=', @@ -60,19 +57,16 @@ 'type': 'static_library', 'dependencies': [ 'egl_native', + '../../third_party/khronos/khronos.gyp:headers', ], 'conditions': [ ['toolkit_uses_gtk == 1', { 'dependencies': ['../../build/linux/system.gyp:gtk'], }], ], - 'include_dirs': ['<(DEPTH)/third_party/khronos'], 'sources': [ '<@(bootstrap_sources_native)', ], - 'direct_dependent_settings': { - 'include_dirs': ['<(DEPTH)/third_party/khronos'], - }, 'defines': [ 'GLES2_CONFORM_SUPPORT_ONLY', 'GTF_GLES20', @@ -85,22 +79,19 @@ 'type': 'static_library', 'dependencies': [ 'egl_native', + '../../third_party/khronos/khronos.gyp:headers', ], 'conditions': [ ['toolkit_uses_gtk == 1', { 'dependencies': ['../../build/linux/system.gyp:gtk'], }], ], - 'include_dirs': ['<(DEPTH)/third_party/khronos'], 'sources': [ 'native/main.cc', 'native/egl_native.cc', 'native/egl_native_windowless.cc', '<@(bootstrap_sources_native)', ], - 'direct_dependent_settings': { - 'include_dirs': ['<(DEPTH)/third_party/khronos'], - }, 'defines': [ 'GLES2_CONFORM_SUPPORT_ONLY', 'GTF_GLES20', @@ -113,9 +104,9 @@ 'type': 'executable', 'dependencies': [ 'egl_native', - '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', - '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib_nocheck', - '<(DEPTH)/third_party/expat/expat.gyp:expat', + '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../../gpu/gpu.gyp:gles2_c_lib_nocheck', + '../../third_party/expat/expat.gyp:expat', ], 'conditions': [ ['toolkit_uses_gtk == 1', { |