Merge pull request #39 from brightray/mac-x64

Build 64-bit on OS X
This commit is contained in:
Adam Roben 2013-12-02 13:42:11 -08:00
commit 837bd784aa
2 changed files with 2 additions and 2 deletions

View file

@ -31,7 +31,7 @@
'target_defaults': {
'xcode_settings': {
'ALWAYS_SEARCH_USER_PATHS': 'NO',
'ARCHS': '$(ARCHS_STANDARD_32_BIT)',
'ARCHS': '$(ARCHS_STANDARD_64_BIT)',
'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++11',
'CLANG_CXX_LIBRARY': 'libstdc++',
'COMBINE_HIDPI_IMAGES': 'YES',

@ -1 +1 @@
Subproject commit 4252769640884c1964cb936c91521e1a1fb50500
Subproject commit 5cce3860fee8a3a981d74d9f616029b807c0738f