From 5b3a670dc03ac0233f8bdeb1e575c18fe3980082 Mon Sep 17 00:00:00 2001 From: "kbr@google.com" Date: Sat, 26 Sep 2009 01:09:48 +0000 Subject: 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 --- o3d/build/common.gypi | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'o3d/build') 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', }, }], ], -- cgit v1.1