diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-02-23 10:31:13 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-23 16:15:07 +0000 |
| commit | a979a1d39dae9944a25d81fa6740d4eced9bbdab (patch) | |
| tree | cfdd48a6c0be110893db33d034038d22469c98df /BUILD.gn | |
| parent | 7df440bbaf2640959fcf9b8c974e3a110b662e65 (diff) | |
Move around GL dependencies.
:gpu gets GL and GLU
:gpu_tool_utils gets X11
:views gets GL and X11
{shared,static}x{gpu,no-gpu} all seem to link.
May not be perfect, but it's a start.
CQ_INCLUDE_TRYBOTS=skia.primary:Build-Ubuntu-GCC-x86_64-Debug-NoGPU,Build-Ubuntu-GCC-x86_64-Release-Shared
Change-Id: Ia6f595a9d601f623a3c686aa00528a80401bcb24
Reviewed-on: https://skia-review.googlesource.com/8911
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'BUILD.gn')
| -rw-r--r-- | BUILD.gn | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -407,6 +407,10 @@ optional("gpu") { sources += [ "src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp" ] } else if (is_linux) { sources += [ "src/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp" ] + libs += [ + "GL", + "GLU", + ] } else if (is_mac) { sources += [ "src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp" ] } else if (is_ios) { @@ -674,11 +678,6 @@ component("skia") { } if (is_linux) { - libs += [ - "GL", - "GLU", - "X11", - ] sources += [ "src/ports/SkDebug_stdio.cpp" ] } @@ -857,6 +856,7 @@ if (skia_enable_tools) { libs += [ "OpenGLES.framework" ] } else if (is_linux) { sources += [ "tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp" ] + libs += [ "X11" ] } else if (is_mac) { sources += [ "tools/gpu/gl/mac/CreatePlatformGLTestContext_mac.cpp" ] } else if (is_win) { @@ -1033,6 +1033,10 @@ if (skia_enable_tools) { "src/views/unix/SkOSWindow_Unix.cpp", "src/views/unix/keysym2ucs.c", ] + libs += [ + "GL", + "X11", + ] } else if (is_mac) { sources += [ "src/views/mac/SkEventNotifier.mm", |