diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-26 01:09:48 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-26 01:09:48 +0000 |
| commit | 5b3a670dc03ac0233f8bdeb1e575c18fe3980082 (patch) | |
| tree | 7f663344ee5d1520b75473b1f682fa90bf92c593 /o3d/build | |
| parent | 9f8634d2e7060f157ef9f1050edd8239e68d6bbd (diff) | |
| download | chromium_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/build')
| -rw-r--r-- | o3d/build/common.gypi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/o3d/build/common.gypi b/o3d/build/common.gypi index b123880..4faaa22 100644 --- a/o3d/build/common.gypi +++ b/o3d/build/common.gypi @@ -34,6 +34,10 @@ ['OS=="mac"', { 'xcode_settings': { 'MACOSX_DEPLOYMENT_TARGET': '10.4', + # TODO(maf): figure out proper fix for the following. + # There is only one place in plugin_mac.mm which attempts + # to use ObjC exception handling. + 'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', }, }], ], |