summaryrefslogtreecommitdiffstats
path: root/o3d/build
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-10 00:43:39 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-10 00:43:39 +0000
commit61bdca81134d6819d442e76b2bf6aefa89122e63 (patch)
treeaff019f6c0df76ed752bc52f01b05d1f600a6f3a /o3d/build
parent95f507b2cd21e5118b119318b9417d1c6e291f85 (diff)
downloadchromium_src-61bdca81134d6819d442e76b2bf6aefa89122e63.zip
chromium_src-61bdca81134d6819d442e76b2bf6aefa89122e63.tar.gz
chromium_src-61bdca81134d6819d442e76b2bf6aefa89122e63.tar.bz2
Now that chromium's common.gypi sets /MP when building under vs2008,
it shouldn't be assumed that /MP should be set for O3D. In particular this can disrupt O3D being build on the buildbot infrastructure which uses VS2005 builders. BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/164237 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build')
-rw-r--r--o3d/build/common.gypi5
1 files changed, 0 insertions, 5 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi
index 0c58010..1883836 100644
--- a/o3d/build/common.gypi
+++ b/o3d/build/common.gypi
@@ -46,11 +46,6 @@
],
# Disable warning: "'this' : used in base member initialization list."
'msvs_disabled_warnings': [4355],
- 'msvs_settings': {
- 'VCCLCompilerTool': {
- 'AdditionalOptions': '/MP',
- },
- },
},
},
],