OLD | NEW |
1 { | 1 { |
2 'variables': { | 2 'variables': { |
3 'visibility%': 'hidden', | 3 'visibility%': 'hidden', |
4 'library%': 'static_library', | 4 'library%': 'static_library', |
5 'component%': '', | 5 'component%': '', |
6 'want_separate_host_toolset': 0, | 6 'want_separate_host_toolset': 0, |
7 }, | 7 }, |
8 | 8 |
9 'conditions': [ | 9 'conditions': [ |
10 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ | 10 ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ |
11 or OS=="netbsd" or OS=="android"', { | 11 or OS=="netbsd" or OS=="android"', { |
12 'target_defaults': { | 12 'target_defaults': { |
13 'cflags': [ '-Wall', '-W', '-Wno-unused-parameter', | 13 'cflags': [ '-Wall', '-W', '-Wno-unused-parameter', |
14 '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', | 14 '-Wnon-virtual-dtor', '-pthread', '-fno-rtti', |
15 '-pedantic', '-std=c++0x', '-fexceptions', ], | 15 '-pedantic', '-std=c++0x', '-fexceptions', ], |
16 'ldflags': [ '-pthread', ], | 16 'ldflags': [ '-pthread', ], |
17 }, | 17 }, |
18 }], | 18 }], |
19 ['OS=="mac"', { | 19 ['OS=="mac"', { |
20 'xcode_settings': { | 20 'xcode_settings': { |
21 'CLANG_CXX_LANGUAGE_STANDARD': 'c++0x', | 21 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', |
22 'CLANG_CXX_LIBRARY': 'libstdc++', | 22 'CLANG_CXX_LIBRARY': 'libc++', |
23 'OTHER_CPLUSPLUSFLAGS' : ['-std=c++0x', '-stdlib=libstdc++'], | 23 'OTHER_CPLUSPLUSFLAGS' : ['-std=c++11', '-stdlib=libc++'], |
24 }, | 24 }, |
25 }], | 25 }], |
26 ['OS=="android"', { | 26 ['OS=="android"', { |
27 'target_defaults': { | 27 'target_defaults': { |
28 'cflags!': [ | 28 'cflags!': [ |
29 '-pthread', # Not supported by Android toolchain. | 29 '-pthread', # Not supported by Android toolchain. |
30 ], | 30 ], |
31 'ldflags!': [ | 31 'ldflags!': [ |
32 '-pthread', # Not supported by Android toolchain. | 32 '-pthread', # Not supported by Android toolchain. |
33 ], | 33 ], |
34 }, | 34 }, |
35 }], | 35 }], |
36 ], | 36 ], |
37 | 37 |
38 'target_defaults': { | 38 'target_defaults': { |
39 'msvs_cygwin_shell': 0, | 39 'msvs_cygwin_shell': 0, |
| 40 |
| 41 'target_conditions': [[ |
| 42 'OS=="mac" and _type=="executable"', { |
| 43 'xcode_settings': { |
| 44 'OTHER_LDFLAGS': ['-stdlib=libc++'], |
| 45 }, |
| 46 } |
| 47 ]], |
40 } | 48 } |
41 } | 49 } |
OLD | NEW |