From db2e25a7d45d8a63ed87af96e5d1bf7577ff48fe Mon Sep 17 00:00:00 2001
From: "borenet@google.com"
 <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Thu, 1 Nov 2012 18:01:08 +0000
Subject: [PATCH] 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
---
 gyp/gpu.gyp   | 1 -
 gyp/views.gyp | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index d5223e4..4f02d00 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 5f58a87..b0697a0 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',
-- 
2.7.4