diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 20:19:06 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-15 20:19:06 +0000 |
| commit | c4514c3c5719c148aacfafb85edabc6cd51ee501 (patch) | |
| tree | cfa40690d02cddfc2e1b8b7b6e0bf8763c33fe78 /webkit/tools/pepper_test_plugin | |
| parent | 0d2e6a6da72279fe8f66eeb3b4442b6e5f4eb67c (diff) | |
| download | chromium_src-c4514c3c5719c148aacfafb85edabc6cd51ee501.zip chromium_src-c4514c3c5719c148aacfafb85edabc6cd51ee501.tar.gz chromium_src-c4514c3c5719c148aacfafb85edabc6cd51ee501.tar.bz2 | |
linux: enable pepper_test_plugin
This includes a way to build it with full support on x64 (and arm ?), by specifying linux_fpic=1 in GYP_DEFINES and re-running gyp.
Review URL: http://codereview.chromium.org/551041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/pepper_test_plugin')
| -rw-r--r-- | webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp | 18 | ||||
| -rw-r--r-- | webkit/tools/pepper_test_plugin/plugin_object.cc | 2 |
2 files changed, 14 insertions, 6 deletions
diff --git a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp index 1cdc8d3..35ba1b0 100644 --- a/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp +++ b/webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp @@ -30,10 +30,6 @@ 'product_name': 'pepper_test_plugin', 'type': 'shared_library', 'msvs_guid': 'EE00E36E-9E8C-4DFB-925E-FBE32CEDB91A', - 'dependencies': [ - '../../../gpu/gpu.gyp:gles2_demo_lib', - '../../../gpu/gpu.gyp:pgl', - ], 'sources': [ 'pepper_test_plugin.def', 'pepper_test_plugin.rc', @@ -49,7 +45,11 @@ ], }, }], - ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', { + ['OS=="linux"', { + 'type': 'shared_library', + 'cflags': ['-fvisibility=hidden'], + }], + ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', { 'product_name': 'pepper_test_plugin', # Shared libraries need -fPIC on x86-64 'cflags': ['-fPIC'], @@ -59,6 +59,14 @@ '../../../base/base.gyp:base', '../../../skia/skia.gyp:skia', ], + 'conditions': [ + ['OS!="mac"', { + 'dependencies': [ + '../../../gpu/gpu.gyp:gles2_demo_lib', + '../../../gpu/gpu.gyp:pgl', + ], + }], + ] }], ['OS=="mac"', { 'type': 'loadable_module', diff --git a/webkit/tools/pepper_test_plugin/plugin_object.cc b/webkit/tools/pepper_test_plugin/plugin_object.cc index aa6422d..7738a8cc 100644 --- a/webkit/tools/pepper_test_plugin/plugin_object.cc +++ b/webkit/tools/pepper_test_plugin/plugin_object.cc @@ -35,7 +35,7 @@ #else #include "base/logging.h" #include "gpu/command_buffer/client/gles2_demo_cc.h" -#include "gpu/command_buffer/common/gles2/gl2.h" +#include "gpu/command_buffer/common/GLES2/gl2.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/effects/SkGradientShader.h" |