From 177002925b7152b6eafe92912fe922eb823d21c6 Mon Sep 17 00:00:00 2001
From: "piman@google.com"
 <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 8 Feb 2010 20:32:40 +0000
Subject: linux: native OpenGL ES support

This includes Gregg's CL 548023
There are still a few hard-coded paths, and issues to solve, but hellocube-textures-glsl is running on an actual device.

Review URL: http://codereview.chromium.org/572029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38385 0039d316-1c4b-4281-b951-d872f2087c98
---
 o3d/plugin/cross/o3d_glue.h | 2 +-
 o3d/plugin/plugin.gyp       | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'o3d/plugin')

diff --git a/o3d/plugin/cross/o3d_glue.h b/o3d/plugin/cross/o3d_glue.h
index d732c13..3e7f8a7 100644
--- a/o3d/plugin/cross/o3d_glue.h
+++ b/o3d/plugin/cross/o3d_glue.h
@@ -41,7 +41,7 @@
 #endif
 
 #ifdef OS_LINUX
-#include <GL/glx.h>
+#include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
 #include <gtk/gtk.h>
 #endif
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp
index 9fca8f9..1e18f0b 100644
--- a/o3d/plugin/plugin.gyp
+++ b/o3d/plugin/plugin.gyp
@@ -212,11 +212,6 @@
               '-Wl,-znodelete',
               '-Wl,--gc-sections',
             ],
-            'link_settings': {
-              'libraries': [
-                '-lGL',
-              ],
-            },
             'conditions' : [
               ['plugin_rpath != ""',
                 {
-- 
cgit v1.1