diff options
Diffstat (limited to 'app/app_base.gypi')
| -rw-r--r-- | app/app_base.gypi | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index 9c50598..db8cceb 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -56,7 +56,6 @@ 'msvs_guid': '4631946D-7D5F-44BD-A5A8-504C0A7033BE', 'variables': { 'app_base_target': 1, - 'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/app', }, 'dependencies': [ # app resources and ui_strings should be shared with the 64-bit @@ -74,17 +73,11 @@ '../ui/base/strings/ui_strings.gyp:ui_strings', '<(libjpeg_gyp_path):libjpeg', ], - 'include_dirs': [ - '../third_party/mesa/MesaLib/include', - '<(gl_binding_output_dir)', - ], # 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': { 'include_dirs': [ '..', - '../third_party/mesa/MesaLib/include', - '<(gl_binding_output_dir)', ], }, 'sources': [ @@ -200,25 +193,6 @@ '../ui/base/x/x11_util.cc', '../ui/base/x/x11_util.h', '../ui/base/x/x11_util_internal.h', - 'gfx/gl/gl_bindings.h', - 'gfx/gl/gl_bindings_skia.cc', - 'gfx/gl/gl_bindings_skia.h', - 'gfx/gl/gl_context.cc', - 'gfx/gl/gl_context.h', - 'gfx/gl/gl_context_linux.cc', - 'gfx/gl/gl_context_mac.cc', - 'gfx/gl/gl_context_osmesa.cc', - 'gfx/gl/gl_context_osmesa.h', - 'gfx/gl/gl_context_stub.cc', - 'gfx/gl/gl_context_stub.h', - 'gfx/gl/gl_context_win.cc', - 'gfx/gl/gl_implementation.cc', - 'gfx/gl/gl_implementation.h', - 'gfx/gl/gl_implementation_linux.cc', - 'gfx/gl/gl_implementation_mac.cc', - 'gfx/gl/gl_implementation_win.cc', - 'gfx/gl/gl_interface.h', - 'gfx/gl/gl_interface.cc', 'mac/nsimage_cache.h', 'mac/nsimage_cache.mm', 'mac/scoped_nsdisable_screen_updates.h', @@ -240,42 +214,6 @@ 'win/scoped_prop.h', 'win/shell.cc', 'win/shell.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h', - ], - # hard_dependency is necessary for this target because it has actions - # that generate header files included by dependent targtets. The header - # files must be generated before the dependents are compiled. The usual - # semantics are to allow the two targets to build concurrently. - 'hard_dependency': 1, - 'actions': [ - { - 'action_name': 'generate_gl_bindings', - 'inputs': [ - 'gfx/gl/generate_bindings.py', - ], - 'outputs': [ - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_gl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_gl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_mock.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h', - ], - 'action': [ - 'python', - 'gfx/gl/generate_bindings.py', - '<(gl_binding_output_dir)', - ], - }, ], 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', { @@ -331,27 +269,12 @@ ], }], ['OS=="linux"', { - 'sources': [ - 'gfx/gl/gl_context_egl.cc', - 'gfx/gl/gl_context_egl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h', - ], 'sources!': [ '../ui/base/keycodes/keyboard_code_conversion_mac.mm', '../ui/base/keycodes/keyboard_code_conversion_mac.h', '../ui/base/keycodes/keyboard_codes_win.h', ], - 'include_dirs': [ - # We don't use angle, but pull the EGL/GLES headers from there. - '../third_party/angle/include', - ], 'all_dependent_settings': { - 'defines': [ - 'GL_GLEXT_PROTOTYPES', - ], 'ldflags': [ '-L<(PRODUCT_DIR)', ], @@ -368,7 +291,6 @@ 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework', - '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], }, 'sources!': [ @@ -382,17 +304,6 @@ ], }], ['OS=="win"', { - 'include_dirs': [ - '../third_party/angle/include', - ], - 'sources': [ - 'gfx/gl/gl_context_egl.cc', - 'gfx/gl/gl_context_egl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_egl.h', - '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc', - '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h', - ], 'sources!': [ '../ui/base/keycodes/keyboard_code_conversion_gtk.cc', '../ui/base/keycodes/keyboard_code_conversion_gtk.h', |