Unified Diff: common.gypi
Issue 5163715573841920:
Issue 768 - Switch from TR1 to C++11 (Closed)
Patch Set: rebase
Created Aug. 5, 2015, 10:38 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« README.md ('K')
|
« README.md ('k')
|
include/AdblockPlus/DefaultFileSystem.h » ('j')
|
include/AdblockPlus/DefaultFileSystem.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: common.gypi |
| diff --git a/common.gypi b/common.gypi |
| index 984d7715e3570a358886c68288beb17e32ff44d7..d56dbee0279f0ba4a32761cb1f9918cb42d5f9c3 100644 |
| --- a/common.gypi |
| +++ b/common.gypi |
| @@ -21,9 +21,9 @@ |
| }], |
| ['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"', { |
| @@ -40,5 +40,12 @@ |
| 'target_defaults': { |
| 'msvs_cygwin_shell': 0, |
| + 'target_conditions': [[ |
| + 'OS=="mac" and _type=="executable"', { |
| + 'xcode_settings': { |
| + 'OTHER_LDFLAGS': ['-stdlib=libc++'], |
| + }, |
| + } |
| + ]], |
| } |
| } |
« README.md ('K')
|
« README.md ('k')
|
include/AdblockPlus/DefaultFileSystem.h » ('j')
|
include/AdblockPlus/DefaultFileSystem.h » ('J')
