diff options
| -rw-r--r-- | gyp/gputest.gyp | 31 | ||||
| -rw-r--r-- | gyp/tools.gyp | 13 |
2 files changed, 16 insertions, 28 deletions
diff --git a/gyp/gputest.gyp b/gyp/gputest.gyp index 2e905189cd..d1067e5f99 100644 --- a/gyp/gputest.gyp +++ b/gyp/gputest.gyp @@ -32,23 +32,7 @@ '<!@(python find.py ../tools/gpu "*")' ], 'conditions': [ - [ 'skia_mesa and skia_os == "linux"', { - 'link_settings': { - 'libraries': [ - '-lOSMesa', - ], - }, - }], - [ 'skia_mesa and skia_os == "mac"', { - 'link_settings': { - 'libraries': [ - '/opt/X11/lib/libOSMesa.dylib', - ], - }, - 'include_dirs': [ - '/opt/X11/include/', - ], - }], + [ 'skia_mesa', { 'dependencies': [ 'osmesa' ] } ], [ 'skia_angle', { 'dependencies': [ 'angle.gyp:*', @@ -121,5 +105,18 @@ }], ], }, + { + 'target_name': 'osmesa', + 'type': 'none', + 'direct_dependent_settings': { + 'link_settings': { 'libraries': [ '-lOSMesa', ], }, + 'conditions': [ + [ 'skia_os == "mac"', { + 'link_settings': { 'library_dirs' : [ '/opt/X11/lib' ], }, + 'include_dirs': [ '/opt/X11/include', ], + }], + ], + }, + }, ], } diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 8af0dfd1ac..cd9223335f 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -351,7 +351,7 @@ '../tools/picture_utils.cpp', '../tools/picture_utils.h', ], - 'include_dirs': [ + 'include_dirs': [ '../src/core/', ], 'dependencies': [ @@ -608,18 +608,9 @@ 'dependencies': [ 'skia_lib.gyp:skia_lib', 'pdf.gyp:pdf', + 'gputest.gyp:osmesa', ], 'defines': [ 'FIDDLE_BUILD_TEST' ], - 'conditions': [ - [ 'skia_os == "mac"', - { - 'link_settings': { 'libraries': [ '/opt/X11/lib/libOSMesa.dylib', ], }, - 'include_dirs': [ '/opt/X11/include/', ], - }, { - 'link_settings': { 'libraries': [ '-lOSMesa' ], }, - } - ], - ], }, ], }, |