Hash :
82844367
Author :
Date :
2015-09-11T13:52:12
Update to the latest versions of the GL and EGL headers. Add GLES 3.1 and 3.2 headers. Remove GLES 3.0 extension headers and entry point files. Re-land fixes double define from different style defines in libGLESv2.gypi and other projects. Change-Id: I6204dc767bd83b7aa7e4d6e2fa338b2ce7f304d8 Reviewed-on: https://chromium-review.googlesource.com/299401 Tested-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160
# Copyright (c) 2014 The ANGLE Project Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
# Everything below this is duplicated in the GN build, except Mac support.
# If you change anything also change angle/BUILD.gn
'variables':
{
'util_sources':
[
'com_utils.h',
'keyboard.h',
'mouse.h',
'random_utils.cpp',
'random_utils.h',
'shader_utils.cpp',
'shader_utils.h',
'system_utils.h',
'Event.h',
'EGLWindow.cpp',
'EGLWindow.h',
'OSPixmap.h',
'OSWindow.cpp',
'OSWindow.h',
'Timer.h',
],
'util_win32_sources':
[
'win32/Win32_system_utils.cpp',
'win32/Win32Pixmap.cpp',
'win32/Win32Pixmap.h',
'win32/Win32Timer.cpp',
'win32/Win32Timer.h',
'win32/Win32Window.cpp',
'win32/Win32Window.h',
],
'util_linux_sources':
[
'linux/Linux_system_utils.cpp',
'linux/LinuxTimer.cpp',
'linux/LinuxTimer.h',
'posix/Posix_system_utils.cpp',
],
'util_x11_sources':
[
'x11/X11Pixmap.cpp',
'x11/X11Pixmap.h',
'x11/X11Window.cpp',
'x11/X11Window.h',
],
'util_osx_sources':
[
'osx/OSX_system_utils.cpp',
'osx/OSXTimer.cpp',
'osx/OSXTimer.h',
'osx/OSXWindow.mm',
'osx/OSXWindow.h',
'posix/Posix_system_utils.cpp',
],
},
'targets':
[
{
'target_name': 'angle_util',
'type': 'static_library',
'includes': [ '../build/common_defines.gypi', ],
'dependencies':
[
'<(angle_path)/src/angle.gyp:angle_common',
'<(angle_path)/src/angle.gyp:libEGL',
'<(angle_path)/src/angle.gyp:libGLESv2',
],
'export_dependent_settings':
[
'<(angle_path)/src/angle.gyp:angle_common',
],
'include_dirs':
[
'<(angle_path)/include',
'<(angle_path)/util',
],
'sources':
[
'<@(util_sources)',
],
'defines':
[
'GL_GLEXT_PROTOTYPES',
'EGL_EGLEXT_PROTOTYPES',
],
'direct_dependent_settings':
{
'include_dirs':
[
'<(angle_path)/include',
'<(angle_path)/util',
],
'defines':
[
'GL_GLEXT_PROTOTYPES',
'EGL_EGLEXT_PROTOTYPES',
],
},
'conditions':
[
['OS=="win"',
{
'msvs_disabled_warnings': [ 4201 ],
'sources':
[
'<@(util_win32_sources)',
],
}],
['OS=="linux"',
{
'sources':
[
'<@(util_linux_sources)',
],
}],
['use_x11==1',
{
'sources':
[
'<@(util_x11_sources)',
],
'link_settings':
{
'ldflags':
[
'<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
],
'libraries':
[
'<!@(pkg-config --libs-only-l x11 xi) -lrt',
],
},
}],
['OS=="mac"',
{
'sources':
[
'<@(util_osx_sources)',
],
'link_settings':
{
# TODO(cwallez) Chromium uses an SDKROOT prefix, use it when we want to
# support compiling ANGLE in Chromium on Mac
'libraries':
[
'AppKit.framework',
'QuartzCore.framework',
],
},
}],
],
},
],
}