Side by Side Diff: libadblockplus.gyp
Issue 5198903443980288:
Issue 321 - libadblockplus build fails on OS X (tr1/memory.h not found) (Closed)
Patch Set:
Created April 14, 2014, 11:26 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« common.gypi ('k')
|
shell/shell.gyp » ('j')
|
no next file with comments »
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 { |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 158 'test/Thread.cpp', | 158 'test/Thread.cpp', |
| 159 'test/UpdateCheck.cpp', | 159 'test/UpdateCheck.cpp', |
| 160 'test/WebRequest.cpp' | 160 'test/WebRequest.cpp' |
| 161 ], | 161 ], |
| 162 'msvs_settings': { | 162 'msvs_settings': { |
| 163 'VCLinkerTool': { | 163 'VCLinkerTool': { |
| 164 'SubSystem': '1', # Console | 164 'SubSystem': '1', # Console |
| 165 'EntryPointSymbol': 'mainCRTStartup', | 165 'EntryPointSymbol': 'mainCRTStartup', |
| 166 }, | 166 }, |
| 167 }, | 167 }, |
| 168 'xcode_settings': { | |
| 169 'OTHER_LDFLAGS': ['-stdlib=libstdc++'], | |
| 170 }, | |
| 168 }] | 171 }] |
| 169 } | 172 } |
| OLD | NEW |
« no previous file with comments
|
« common.gypi ('k')
|
shell/shell.gyp » ('j')
|
no next file with comments »
