| 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 |
|
Felix Dahlke
2013/05/23 13:35:44
How about "... on Windows or Android ..."?
| |
| 4 'OS=="win"', | 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/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'], | |
| 26 'sources': [ | 25 'sources': [ |
| 27 'src/AppInfoJsObject.cpp', | 26 'src/AppInfoJsObject.cpp', |
| 28 'src/ConsoleJsObject.cpp', | 27 'src/ConsoleJsObject.cpp', |
| 29 'src/DefaultLogSystem.cpp', | 28 'src/DefaultLogSystem.cpp', |
| 30 'src/DefaultFileSystem.cpp', | 29 'src/DefaultFileSystem.cpp', |
| 31 'src/FileSystemJsObject.cpp', | 30 'src/FileSystemJsObject.cpp', |
| 32 'src/FilterEngine.cpp', | 31 'src/FilterEngine.cpp', |
| 33 'src/GlobalJsObject.cpp', | 32 'src/GlobalJsObject.cpp', |
| 34 'src/JsEngine.cpp', | 33 'src/JsEngine.cpp', |
| 35 'src/JsValue.cpp', | 34 'src/JsValue.cpp', |
| 36 'src/Thread.cpp', | 35 'src/Thread.cpp', |
| 37 'src/Utils.cpp', | 36 'src/Utils.cpp', |
| 38 'src/WebRequestJsObject.cpp', | 37 'src/WebRequestJsObject.cpp', |
| 39 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' | 38 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' |
| 40 ], | 39 ], |
| 41 'direct_dependent_settings': { | 40 'direct_dependent_settings': { |
| 42 'include_dirs': ['include'] | 41 'include_dirs': [ |
| 42 'include', | |
| 43 'third_party/v8/include', | |
|
Wladimir Palant
2013/05/16 10:32:19
Not sure why this only came up when compiling for
| |
| 44 ] | |
| 43 }, | 45 }, |
| 44 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], | |
| 45 'conditions': [ | 46 'conditions': [ |
| 47 ['OS=="android"', { | |
| 48 'link_settings': { | |
| 49 'libraries': [ | |
| 50 'android_arm.release/obj.target/tools/gyp/libv8_base.a', | |
| 51 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a', | |
| 52 ], | |
| 53 } | |
| 54 }, { | |
| 55 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], | |
| 56 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], | |
| 57 }], | |
| 46 ['have_curl==1', | 58 ['have_curl==1', |
| 47 { | 59 { |
| 48 'sources': [ | 60 'sources': [ |
| 49 'src/DefaultWebRequestCurl.cpp', | 61 'src/DefaultWebRequestCurl.cpp', |
| 50 ], | 62 ], |
| 51 'link_settings': { | 63 'link_settings': { |
| 52 'libraries': ['-lcurl'] | 64 'libraries': ['-lcurl'] |
| 53 }, | 65 }, |
| 54 'all_dependent_settings': { | 66 'all_dependent_settings': { |
| 55 'defines': ['HAVE_CURL'], | 67 'defines': ['HAVE_CURL'], |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 142 'test/WebRequest.cpp' | 154 'test/WebRequest.cpp' |
| 143 ], | 155 ], |
| 144 'msvs_settings': { | 156 'msvs_settings': { |
| 145 'VCLinkerTool': { | 157 'VCLinkerTool': { |
| 146 'SubSystem': '1', # Console | 158 'SubSystem': '1', # Console |
| 147 'EntryPointSymbol': 'mainCRTStartup', | 159 'EntryPointSymbol': 'mainCRTStartup', |
| 148 }, | 160 }, |
| 149 }, | 161 }, |
| 150 }] | 162 }] |
| 151 } | 163 } |
| OLD | NEW |