diff options
| author |  borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-01 18:01:08 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-11-01 18:01:08 +0000 |
| commit | db2e25a7d45d8a63ed87af96e5d1bf7577ff48fe (patch) | |
| tree | 6a1bc01e5cc695e83af40eeae9193026b5af937c /gyp | |
| parent | 7158e6acca1b1ecc321d4d514a31cba11b5ead60 (diff) | |
Fix NoGPU build
Some link settings were set in the wrong targets
git-svn-id: http://skia.googlecode.com/svn/trunk@6246 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/gpu.gyp | 1 | ||||
| -rw-r--r-- | gyp/views.gyp | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index d5223e40ef..4f02d00c8f 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -214,7 +214,6 @@ 'libraries': [ '-lGL', '-lGLU', - '-lX11', ], }, }], diff --git a/gyp/views.gyp b/gyp/views.gyp index 5f58a87f49..b0697a03d1 100644 --- a/gyp/views.gyp +++ b/gyp/views.gyp @@ -98,6 +98,13 @@ ], }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { + 'link_settings': { + 'libraries': [ + '-lGL', + '-lGLU', + '-lX11', + ], + }, },{ 'sources!': [ '../src/views/unix/SkOSWindow_Unix.cpp', |