diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 06:54:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-26 06:54:06 +0000 |
| commit | 638235b0ef2c3e12f6ceecf05f89caf46b311d81 (patch) | |
| tree | b676ad477a68bad89cd6a35dff9d4e791cef5692 /chrome/gpu/gpu_main.cc | |
| parent | 48c27f7fac6bb5cf9cc995df8a68d4f6d4c10600 (diff) | |
| download | chromium_src-638235b0ef2c3e12f6ceecf05f89caf46b311d81.zip chromium_src-638235b0ef2c3e12f6ceecf05f89caf46b311d81.tar.gz chromium_src-638235b0ef2c3e12f6ceecf05f89caf46b311d81.tar.bz2 | |
Fix the ARM build which can't find OpenGL. This adds a new define which I use
to detect X and GL related build options. On ARM, this means we don't compile
the accelerated backing store even though its Linux.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/546144
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu/gpu_main.cc')
| -rw-r--r-- | chrome/gpu/gpu_main.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/gpu/gpu_main.cc b/chrome/gpu/gpu_main.cc index 8dd5cc4..c633025 100644 --- a/chrome/gpu/gpu_main.cc +++ b/chrome/gpu/gpu_main.cc @@ -6,6 +6,7 @@ #include "build/build_config.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/main_function_params.h" +#include "chrome/gpu/gpu_config.h" #include "chrome/gpu/gpu_process.h" #include "chrome/gpu/gpu_thread.h" @@ -15,7 +16,7 @@ #if defined(OS_WIN) #include "app/win_util.h" -#elif defined(OS_LINUX) +#elif defined(GPU_USE_GLX) #include <dlfcn.h> #include <GL/glxew.h> #endif @@ -33,7 +34,7 @@ int GpuMain(const MainFunctionParams& parameters) { #if defined(OS_WIN) win_util::ScopedCOMInitializer com_initializer; -#elif defined(OS_LINUX) +#elif defined(GPU_USE_GLX) dlopen("libGL.so.1", RTLD_LAZY | RTLD_GLOBAL); glxewInit(); #endif |