diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 18:32:06 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 18:32:06 +0000 |
| commit | 5a6db6cd70a969bc78d931ba352d222db0682ece (patch) | |
| tree | a97c62adccbda5956cf9f3511da5d1328c847cd6 /app/app_base.gypi | |
| parent | 2f28c5684b55211bd4ea28b4407128e0ae86ddee (diff) | |
| download | chromium_src-5a6db6cd70a969bc78d931ba352d222db0682ece.zip chromium_src-5a6db6cd70a969bc78d931ba352d222db0682ece.tar.gz chromium_src-5a6db6cd70a969bc78d931ba352d222db0682ece.tar.bz2 | |
Landing 45240 again.
GLContext implementations were dependent on some stuff in app/.
Moved GLContext class to app/gfx/gl. Now it can be used by code outside of the gpu project, for example AcceleratedSurface.
TEST=trybots, checkdeps
BUG=none
Review URL: http://codereview.chromium.org/1689006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/app_base.gypi')
| -rw-r--r-- | app/app_base.gypi | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index 802a0d2..f046e2c 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -85,6 +85,12 @@ '../third_party/sqlite/sqlite.gyp:sqlite', '../third_party/zlib/zlib.gyp:zlib', ], + 'defines': [ + 'GLEW_STATIC', + ], + 'include_dirs': [ + '../third_party/glew/include', + ], # TODO(gregoryd): The direct_dependent_settings should be shared with # the 64-bit target, but it doesn't work due to a bug in gyp 'direct_dependent_settings': { @@ -117,6 +123,16 @@ 'file_download_interface.h', 'gfx/font_util.h', 'gfx/font_util.cc', + 'gfx/gl/gl_context.cc', + 'gfx/gl/gl_context.h', + 'gfx/gl/gl_context_osmesa.cc', + 'gfx/gl/gl_context_osmesa.h', + 'gfx/gl/gl_context_linux.cc', + 'gfx/gl/gl_context_linux.h', + 'gfx/gl/gl_context_mac.cc', + 'gfx/gl/gl_context_mac.h', + 'gfx/gl/gl_context_win.cc', + 'gfx/gl/gl_context_win.h', 'gtk_dnd_util.cc', 'gtk_dnd_util.h', 'gtk_signal.cc', @@ -181,6 +197,7 @@ 'x11_util.cc', 'x11_util.h', 'x11_util_internal.h', + '../third_party/glew/src/glew.c', ], 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { |