summaryrefslogtreecommitdiffstats
path: root/o3d/build/common.gypi
diff options
context:
space:
mode:
authorgspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 00:00:09 +0000
committergspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-15 00:00:09 +0000
commit9650ee1b6091dda7e120cb9331cf850341dd1b21 (patch)
treefb9ab4e770cf11dad26eca530f8179401c6db6ab /o3d/build/common.gypi
parent7bc2207dbb33378f092a6d8d10968fb59330005d (diff)
downloadchromium_src-9650ee1b6091dda7e120cb9331cf850341dd1b21.zip
chromium_src-9650ee1b6091dda7e120cb9331cf850341dd1b21.tar.gz
chromium_src-9650ee1b6091dda7e120cb9331cf850341dd1b21.tar.bz2
This adds some infrastructure for building O3D as part of the Chrome build,
and fixes some of the "AdditionalDependencies" tags to be just generic 'libraries' tags to be more general. TEST=none BUG=none Review URL: http://codereview.chromium.org/149650 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build/common.gypi')
-rw-r--r--o3d/build/common.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi
index b1fb160..08f3906 100644
--- a/o3d/build/common.gypi
+++ b/o3d/build/common.gypi
@@ -18,6 +18,7 @@
'pngdir': 'third_party/libpng',
'skiadir': 'third_party/skia/include',
'zlibdir': 'third_party/zlib',
+ 'o3d_in_chrome%': 0,
},
'target_defaults': {
'defines': [