summaryrefslogtreecommitdiffstats
path: root/o3d/tests/tests.gyp
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-26 01:09:48 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-26 01:09:48 +0000
commit5b3a670dc03ac0233f8bdeb1e575c18fe3980082 (patch)
tree7f663344ee5d1520b75473b1f682fa90bf92c593 /o3d/tests/tests.gyp
parent9f8634d2e7060f157ef9f1050edd8239e68d6bbd (diff)
downloadchromium_src-5b3a670dc03ac0233f8bdeb1e575c18fe3980082.zip
chromium_src-5b3a670dc03ac0233f8bdeb1e575c18fe3980082.tar.gz
chromium_src-5b3a670dc03ac0233f8bdeb1e575c18fe3980082.tar.bz2
Fixed Mac gyp build. Switched to using Chrome hash_tables.h, changed
how hash functions are specified for certain key types, and deleted our std_hash.h. Fixed forward reference bug in cmd_buffer_format.h. Built and tested on Windows and Mac. Remaining workarounds: enabled C++ exceptions due to use of Objective C try/catch in plugin_mac.mm; disabled warnings as errors due to signed / unsigned issues in command buffer code, which will probably need to be fixed by changing typedefs and argument types. Review URL: http://codereview.chromium.org/249013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests/tests.gyp')
-rw-r--r--o3d/tests/tests.gyp11
1 files changed, 11 insertions, 0 deletions
diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp
index a4cc2a9..a2d25b3 100644
--- a/o3d/tests/tests.gyp
+++ b/o3d/tests/tests.gyp
@@ -14,6 +14,17 @@
'..',
'../..',
],
+ # TODO(rlp): remove this after fixing signed / unsigned issues in
+ # command buffer code and tests.
+ 'target_conditions': [
+ ['OS == "mac"',
+ {
+ 'xcode_settings': {
+ 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO'
+ },
+ },
+ ],
+ ],
},
'targets': [
{