Skip to content

A
angle
Commit 14ecb13f by Corentin Wallez
Options

libGLESv2.gypi move the link to X11 to libANGLE (vs. libGLESv2)

This fixes a bot compilation failure that started happening after unittest started using Display stuff that use X11. Because angle_unittests was linking against libANGLE and not libGLESv2, it didn't get linked to X11, which produced a link error. BUG= Change-Id: I8f1f0dbcb13bb7c9897f235b72c4d4896a7b8a6c Reviewed-on: https://chromium-review.googlesource.com/292380Tested-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org>
parent 19b890af
Showing with 22 additions and 25 deletions
src/libGLESv2.gypi
...@@ -709,6 +709,28 @@ ...@@ -709,6 +709,28 @@
[ [
'<@(libangle_gl_glx_sources)', '<@(libangle_gl_glx_sources)',
], ],
'link_settings': {
'ldflags': [
'<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
],
'libraries': [
'<!@(pkg-config --libs-only-l x11 xi) -ldl',
],
},
}],
['angle_link_glx==1',
{
'link_settings':
{
'libraries':
[
'-lGL',
],
},
'defines':
[
'ANGLE_LINK_GLX',
],
}], }],
['OS=="mac"', ['OS=="mac"',
{ {
...@@ -748,20 +770,6 @@ ...@@ -748,20 +770,6 @@
{ {
'msvs_enable_winphone' : '1', 'msvs_enable_winphone' : '1',
}], }],
['angle_link_glx==1',
{
'link_settings':
{
'libraries':
[
'-lGL',
],
},
'defines':
[
'ANGLE_LINK_GLX',
],
}],
], ],
}, },
{ {
...@@ -797,17 +805,6 @@ ...@@ -797,17 +805,6 @@
{ {
'msvs_enable_winphone' : '1', 'msvs_enable_winphone' : '1',
}], }],
['angle_use_glx==1',
{
'link_settings': {
'ldflags': [
'<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
],
'libraries': [
'<!@(pkg-config --libs-only-l x11 xi) -ldl',
],
},
}],
['OS == "mac"', ['OS == "mac"',
{ {
'all_dependent_settings': 'all_dependent_settings':
......
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