| Index: common.gypi |
| =================================================================== |
| --- a/common.gypi |
| +++ b/common.gypi |
| @@ -13,29 +13,37 @@ |
| 'cflags': [ '-Wall', '-W', '-Wno-unused-parameter', |
| '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', |
| '-pedantic', '-std=c++0x', '-fexceptions', ], |
| 'ldflags': [ '-pthread', ], |
| }, |
| }], |
| ['OS=="mac"', { |
| 'xcode_settings': { |
| - 'CLANG_CXX_LANGUAGE_STANDARD': 'c++0x', |
| - 'CLANG_CXX_LIBRARY': 'libstdc++', |
| - 'OTHER_CPLUSPLUSFLAGS' : ['-std=c++0x', '-stdlib=libstdc++'], |
| + 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', |
| + 'CLANG_CXX_LIBRARY': 'libc++', |
| + 'OTHER_CPLUSPLUSFLAGS' : ['-std=c++11', '-stdlib=libc++'], |
| }, |
| }], |
| ['OS=="android"', { |
| 'target_defaults': { |
| 'cflags!': [ |
| '-pthread', # Not supported by Android toolchain. |
| ], |
| 'ldflags!': [ |
| '-pthread', # Not supported by Android toolchain. |
| ], |
| }, |
| }], |
| ], |
| 'target_defaults': { |
| 'msvs_cygwin_shell': 0, |
| + |
| + 'target_conditions': [[ |
| + 'OS=="mac" and _type=="executable"', { |
| + 'xcode_settings': { |
| + 'OTHER_LDFLAGS': ['-stdlib=libc++'], |
| + }, |
| + } |
| + ]], |
| } |
| } |