| Index: gyp/common_conditions.gypi
|
| diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
|
| index e7edb2763f90a86049dd73afbca0816957150805..b710462787ae0af92d069ed821141cbd1766d305 100644
|
| --- a/gyp/common_conditions.gypi
|
| +++ b/gyp/common_conditions.gypi
|
| @@ -388,7 +388,7 @@
|
| '<@(skia_for_android_framework_defines)',
|
| ],
|
| }],
|
| -
|
| +
|
| [ 'skia_use_sdl == 1',
|
| {
|
| 'defines': [ 'SK_USE_SDL' ],
|
| @@ -496,11 +496,12 @@
|
| [ 'skia_arch_type == "x86"', { 'ARCHS': ['i386'] }],
|
| [ 'skia_arch_type == "x86_64"', { 'ARCHS': ['x86_64'] }],
|
| [ 'skia_osx_deployment_target==""', {
|
| - 'MACOSX_DEPLOYMENT_TARGET': '10.6', # -mmacos-version-min, passed in env to ld.
|
| + 'MACOSX_DEPLOYMENT_TARGET': '10.7', # -mmacos-version-min, passed in env to ld.
|
| }, {
|
| 'MACOSX_DEPLOYMENT_TARGET': '<(skia_osx_deployment_target)',
|
| }],
|
| ],
|
| + 'CLANG_CXX_LIBRARY': 'libc++',
|
| 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
|
| 'GCC_ENABLE_CPP_EXCEPTIONS': 'NO', # -fno-exceptions
|
| 'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti
|
|
|