| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 1 { | 1 { |
| 2 'conditions': [[ | 2 'conditions': [[ |
| 3 # We don't want to use curl on Windows, skip the check there | 3 # We don't want to use curl on Windows, skip the check there |
| 4 'OS=="win"', | 4 'OS=="win"', |
| 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/common.gypi', |
| 17 'shell/shell.gyp'], | 17 'shell/shell.gyp'], |
| 18 'targets': [{ | 18 'targets': [{ |
| 19 'target_name': 'libadblockplus', | 19 'target_name': 'libadblockplus', |
| 20 'type': '<(library)', | 20 'type': '<(library)', |
| 21 'include_dirs': [ | 21 'include_dirs': [ |
| 22 'include', | 22 'include', |
| 23 'third_party/v8/include' | 23 'third_party/v8/include' |
| 24 ], | 24 ], |
| 25 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 25 'dependencies': [], |
|
Wladimir Palant
2013/05/07 08:18:54
You can simply remove that entry, having an empty
| |
| 26 'conditions': [ | |
| 27 ['OS!="android"', { | |
| 28 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], | |
|
Eric
2013/06/12 14:48:17
I am curious as to why this dependency is needed f
Wladimir Palant
2013/06/12 19:33:23
It's actually the other way round. For Android we
| |
| 29 }] | |
| 30 ], | |
| 26 'sources': [ | 31 'sources': [ |
| 27 'src/AppInfoJsObject.cpp', | 32 'src/AppInfoJsObject.cpp', |
| 28 'src/ConsoleJsObject.cpp', | 33 'src/ConsoleJsObject.cpp', |
| 29 'src/DefaultErrorCallback.cpp', | 34 'src/DefaultErrorCallback.cpp', |
| 30 'src/DefaultFileSystem.cpp', | 35 'src/DefaultFileSystem.cpp', |
| 31 'src/ErrorCallback.cpp', | 36 'src/ErrorCallback.cpp', |
| 32 'src/FileSystemJsObject.cpp', | 37 'src/FileSystemJsObject.cpp', |
| 33 'src/FilterEngine.cpp', | 38 'src/FilterEngine.cpp', |
| 34 'src/GlobalJsObject.cpp', | 39 'src/GlobalJsObject.cpp', |
| 35 'src/JsEngine.cpp', | 40 'src/JsEngine.cpp', |
| 36 'src/JsValue.cpp', | 41 'src/JsValue.cpp', |
| 37 'src/Thread.cpp', | 42 'src/Thread.cpp', |
| 38 'src/Utils.cpp', | 43 'src/Utils.cpp', |
| 39 'src/WebRequestJsObject.cpp', | 44 'src/WebRequestJsObject.cpp', |
| 40 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' | 45 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' |
| 41 ], | 46 ], |
| 42 'direct_dependent_settings': { | 47 'direct_dependent_settings': { |
| 43 'include_dirs': ['include'] | 48 'include_dirs': ['include'] |
| 44 }, | 49 }, |
| 45 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 50 'export_dependent_settings': [], |
|
Wladimir Palant
2013/05/07 08:18:54
You can simply remove that entry, having an empty
| |
| 51 'conditions': [ | |
| 52 ['OS!="android"', { | |
| 53 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], | |
| 54 }] | |
| 55 ], | |
| 46 'conditions': [ | 56 'conditions': [ |
| 47 ['have_curl==1', | 57 ['have_curl==1', |
| 48 { | 58 { |
| 49 'sources': [ | 59 'sources': [ |
| 50 'src/DefaultWebRequestCurl.cpp', | 60 'src/DefaultWebRequestCurl.cpp', |
| 51 ], | 61 ], |
| 52 'link_settings': { | 62 'link_settings': { |
| 53 'libraries': ['-lcurl'] | 63 'libraries': ['-lcurl'] |
| 54 }, | 64 }, |
| 55 'all_dependent_settings': { | 65 'all_dependent_settings': { |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 140 'test/WebRequest.cpp' | 150 'test/WebRequest.cpp' |
| 141 ], | 151 ], |
| 142 'msvs_settings': { | 152 'msvs_settings': { |
| 143 'VCLinkerTool': { | 153 'VCLinkerTool': { |
| 144 'SubSystem': '1', # Console | 154 'SubSystem': '1', # Console |
| 145 'EntryPointSymbol': 'mainCRTStartup', | 155 'EntryPointSymbol': 'mainCRTStartup', |
| 146 }, | 156 }, |
| 147 }, | 157 }, |
| 148 }] | 158 }] |
| 149 } | 159 } |
| OLD | NEW |