Side by Side Diff: libadblockplus.gyp
Issue 6584950149087232:
Issue 1280 - Update v8 (Closed)
Patch Set: get rid of auto and fix friends of JsValue
Created Oct. 31, 2014, 5:11 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« include/AdblockPlus/V8ValueHolder.h ('K')
|
« include/AdblockPlus/V8ValueHolder.h ('k')
|
src/DefaultWebRequestWinInet.cpp » ('j')
|
src/DefaultWebRequestWinInet.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 'conditions': [[ | 2 'conditions': [[ |
| 3 # We don't want to use curl on Windows and Android, skip the check there | 3 # We don't want to use curl on Windows and Android, skip the check there |
| 4 'OS=="win" or OS=="android"', | 4 'OS=="win" or OS=="android"', |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'have_curl': 0 | 7 'have_curl': 0 |
| 8 } | 8 } |
| 9 }, | 9 }, |
| 10 { | 10 { |
| 11 'variables': { | 11 'variables': { |
| 12 'have_curl': '<!(python check_curl.py)' | 12 'have_curl': '<!(python check_curl.py)' |
| 13 } | 13 } |
| 14 } | 14 } |
| 15 ]], | 15 ]], |
| 16 'includes': ['third_party/v8/build/common.gypi', | 16 'includes': ['third_party/v8/build/features.gypi', |
| 17 'third_party/v8/build/toolchain.gypi', | |
| 17 'shell/shell.gyp'], | 18 'shell/shell.gyp'], |
| 18 'targets': [{ | 19 'targets': [{ |
| 19 'target_name': 'libadblockplus', | 20 'target_name': 'libadblockplus', |
| 20 'type': '<(library)', | 21 'type': '<(library)', |
| 21 'include_dirs': [ | 22 'include_dirs': [ |
| 22 'include', | 23 'include', |
| 23 'third_party/v8/include', | 24 'third_party/v8/include', |
| 24 ], | 25 ], |
| 25 'sources': [ | 26 'sources': [ |
| 26 'src/AppInfoJsObject.cpp', | 27 'src/AppInfoJsObject.cpp', |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 165 'VCLinkerTool': { | 166 'VCLinkerTool': { |
| 166 'SubSystem': '1', # Console | 167 'SubSystem': '1', # Console |
| 167 'EntryPointSymbol': 'mainCRTStartup', | 168 'EntryPointSymbol': 'mainCRTStartup', |
| 168 }, | 169 }, |
| 169 }, | 170 }, |
| 170 'xcode_settings': { | 171 'xcode_settings': { |
| 171 'OTHER_LDFLAGS': ['-stdlib=libstdc++'], | 172 'OTHER_LDFLAGS': ['-stdlib=libstdc++'], |
| 172 }, | 173 }, |
| 173 }] | 174 }] |
| 174 } | 175 } |
| OLD | NEW |
