diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 23:22:28 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 23:22:28 +0000 |
| commit | 33dc8fa07256578d33459d4433dbaf613dec62c7 (patch) | |
| tree | dabcf73287957b753b2722c96d9945c60f5eb61b /o3d/build | |
| parent | 7db104022c5d04b22473c8258fabdd6a12301242 (diff) | |
| download | chromium_src-33dc8fa07256578d33459d4433dbaf613dec62c7.zip chromium_src-33dc8fa07256578d33459d4433dbaf613dec62c7.tar.gz chromium_src-33dc8fa07256578d33459d4433dbaf613dec62c7.tar.bz2 | |
Diabolic hackery to work around differing NPAPI headers and definitions between Chromium and O3D.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/242042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build')
| -rw-r--r-- | o3d/build/common.gypi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index 4faaa22..69c2081 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -43,6 +43,13 @@ ], }, 'conditions' : [ + ['o3d_in_chrome == 1', + { + 'defined': [ + 'O3D_IN_CHROME', + ], + }, + ], ['OS == "win"', { 'variables': { |