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