Skip to content

A
angle
Commit 4031b994 by Geoff Lang
Options

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

BUG=493682 Change-Id: I10d5b710fcc9b51160c3aff169d1af839212003c Reviewed-on: https://chromium-review.googlesource.com/273976Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 57df19ce
Showing with 32 additions and 26 deletions
build/common.gypi
...@@ -32,6 +32,17 @@ ...@@ -32,6 +32,17 @@
'-Wwrite-strings', '-Wwrite-strings',
'-Wno-format-nonliteral', '-Wno-format-nonliteral',
], ],
'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':
[ [
...@@ -29,7 +21,7 @@ ...@@ -29,7 +21,7 @@
# TODO: 4702 doesn't fire on xtree in VS2015 (CTP6). We can remove C4702 after moving to VS2015. # TODO: 4702 doesn't fire on xtree in VS2015 (CTP6). We can remove C4702 after moving to VS2015.
4702, # Unreachable code. Should only fire on system header xtree. 4702, # Unreachable code. Should only fire on system header xtree.
4718, # Recursive call has no side effects. Fires on xtree too. 4718, # Recursive call has no side effects. Fires on xtree too.
], ],
'conditions': 'conditions':
......
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
...@@ -550,13 +550,16 @@ ...@@ -550,13 +550,16 @@
[ [
'ANGLE_ENABLE_OPENGL', 'ANGLE_ENABLE_OPENGL',
], ],
}], 'conditions':
['use_x11==1',
{
'defines':
[ [
'ANGLE_USE_X11', ['use_x11==1',
] {
'defines':
[
'ANGLE_USE_X11',
]
}],
],
}], }],
], ],
}, },
...@@ -669,6 +672,10 @@ ...@@ -669,6 +672,10 @@
}], }],
['use_x11==1', ['use_x11==1',
{ {
'defines':
[
'ANGLE_USE_X11',
],
'sources': 'sources':
[ [
'<@(libangle_gl_glx_sources)', '<@(libangle_gl_glx_sources)',
...@@ -676,13 +683,6 @@ ...@@ -676,13 +683,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
...@@ -99,11 +99,14 @@ ...@@ -99,11 +99,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) -lrt', '<!@(pkg-config --libs-only-l x11 xi) -lrt',
], ],
}, },
......
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