Skip to content

A
angle
Commit 90d5f9b1 by Geoff Lang Committed by Jamie Madill
Options

Don't enable opengl on linux unless x11 is also available.

BUG=493682 Change-Id: I10d5b710fcc9b51160c3aff169d1af839212003c Reviewed-on: https://chromium-review.googlesource.com/274036Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 9b38269c
Showing with 31 additions and 25 deletions
build/common.gypi
...@@ -34,6 +34,17 @@ ...@@ -34,6 +34,17 @@
'-Wno-format-nonliteral', '-Wno-format-nonliteral',
'-Wno-deprecated-register', '-Wno-deprecated-register',
], ],
'conditions':
[
['OS=="linux"',
{
'use_x11%': 1,
},
{
'use_x11%': 0,
}],
],
}, },
'target_defaults': 'target_defaults':
{ {
......
build/common_defines.gypi
...@@ -10,14 +10,6 @@ ...@@ -10,14 +10,6 @@
'angle_build_winrt%': '0', 'angle_build_winrt%': '0',
'angle_build_winphone%': '0', 'angle_build_winphone%': '0',
'angle_build_winrt_app_type_revision%': '8.1', 'angle_build_winrt_app_type_revision%': '8.1',
'use_x11%': 0,
'conditions':
[
['OS=="linux"',
{
'use_x11%': 1,
}],
],
}, },
'msvs_disabled_warnings': 'msvs_disabled_warnings':
[ [
......
src/angle.gyp
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
'angle_enable_d3d11%': 1, 'angle_enable_d3d11%': 1,
'angle_enable_hlsl%': 1, 'angle_enable_hlsl%': 1,
}], }],
['OS=="linux"', ['OS=="linux" and use_x11==1',
{ {
'angle_enable_gl%': 1, 'angle_enable_gl%': 1,
}], }],
......
src/libGLESv2.gypi
...@@ -546,13 +546,16 @@ ...@@ -546,13 +546,16 @@
[ [
'ANGLE_ENABLE_OPENGL', 'ANGLE_ENABLE_OPENGL',
], ],
}], 'conditions':
['use_x11==1',
{
'defines':
[ [
'ANGLE_USE_X11', ['use_x11==1',
] {
'defines':
[
'ANGLE_USE_X11',
]
}],
],
}], }],
], ],
}, },
...@@ -665,6 +668,10 @@ ...@@ -665,6 +668,10 @@
}], }],
['use_x11==1', ['use_x11==1',
{ {
'defines':
[
'ANGLE_USE_X11',
],
'sources': 'sources':
[ [
'<@(libangle_gl_glx_sources)', '<@(libangle_gl_glx_sources)',
...@@ -672,13 +679,6 @@ ...@@ -672,13 +679,6 @@
}], }],
], ],
}], }],
['use_x11==1',
{
'defines':
[
'ANGLE_USE_X11',
]
}],
['angle_build_winrt==0 and OS=="win"', ['angle_build_winrt==0 and OS=="win"',
{ {
'dependencies': 'dependencies':
......
util/util.gyp
...@@ -98,11 +98,14 @@ ...@@ -98,11 +98,14 @@
[ [
'<@(util_x11_sources)', '<@(util_x11_sources)',
], ],
'link_settings': { 'link_settings':
'ldflags': [ {
'ldflags':
[
'<!@(pkg-config --libs-only-L --libs-only-other x11 xi)', '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
], ],
'libraries': [ 'libraries':
[
'<!@(pkg-config --libs-only-l x11 xi)', '<!@(pkg-config --libs-only-l x11 xi)',
], ],
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment