| Left: | ||
| Right: |
| 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 ], | |
| 16 [ | |
| 17 'OS=="win"', { | |
| 18 'targets': [{ | |
| 19 'target_name': 'build-v8', | |
| 20 'type': 'none', | |
| 21 'actions': [{ | |
| 22 'action_name': 'build-v8', | |
| 23 'inputs': ['build-v8.cmd'], | |
| 24 'outputs': [ | |
| 25 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libplatform. lib', | |
| 26 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_0.lib', | |
| 27 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_1.lib', | |
| 28 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_2.lib', | |
| 29 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_base_3.lib', | |
| 30 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libbase.lib' , | |
| 31 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_libsampler.l ib', | |
| 32 'build/<(target_arch)/v8/build/<(CONFIGURATION_NAME)/v8_snapshot.lib ', | |
| 33 ], | |
| 34 'action': [ | |
| 35 'cmd', | |
| 36 '/C', | |
| 37 'build-v8.cmd', | |
| 38 '$(MSBuildBinPath)', | |
| 39 '<(target_arch)', | |
| 40 '<(CONFIGURATION_NAME)', | |
| 41 '$(PlatformToolset)' | |
| 42 ] | |
| 43 }], | |
| 44 }] | |
| 45 } | |
| 46 ]], | 15 ]], |
| 47 'includes': ['shell/shell.gyp'], | 16 'includes': ['v8.gypi', 'shell/shell.gyp'], |
| 48 'targets': [{ | 17 'targets': [{ |
| 49 'target_name': 'libadblockplus', | 18 'target_name': 'libadblockplus', |
| 50 'type': '<(library)', | 19 'type': '<(library)', |
| 20 'dependencies': ['<@(libv8_build_targets)'], | |
| 51 'xcode_settings':{}, | 21 'xcode_settings':{}, |
| 52 'include_dirs': [ | 22 'include_dirs': [ |
| 53 'include', | 23 'include', |
| 54 'third_party/v8/include', | 24 '<(libv8_include_dir)' |
| 55 'third_party/v8', | |
|
sergei
2017/07/20 10:23:00
Here is a change, it turned out that there is no n
| |
| 56 ], | 25 ], |
| 57 'sources': [ | 26 'sources': [ |
| 58 'include/AdblockPlus/ITimer.h', | 27 'include/AdblockPlus/ITimer.h', |
| 59 'include/AdblockPlus/IWebRequest.h', | 28 'include/AdblockPlus/IWebRequest.h', |
| 60 'include/AdblockPlus/DefaultWebRequest.h', | 29 'include/AdblockPlus/DefaultWebRequest.h', |
| 61 'include/AdblockPlus/IFileSystem.h', | 30 'include/AdblockPlus/IFileSystem.h', |
| 62 'include/AdblockPlus/DefaultFileSystem.h', | 31 'include/AdblockPlus/DefaultFileSystem.h', |
| 63 'src/AppInfoJsObject.cpp', | 32 'src/AppInfoJsObject.cpp', |
| 64 'src/ConsoleJsObject.cpp', | 33 'src/ConsoleJsObject.cpp', |
| 65 'src/DefaultLogSystem.cpp', | 34 'src/DefaultLogSystem.cpp', |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 76 'src/JsValue.cpp', | 45 'src/JsValue.cpp', |
| 77 'src/Notification.cpp', | 46 'src/Notification.cpp', |
| 78 'src/ReferrerMapping.cpp', | 47 'src/ReferrerMapping.cpp', |
| 79 'src/Thread.cpp', | 48 'src/Thread.cpp', |
| 80 'src/Utils.cpp', | 49 'src/Utils.cpp', |
| 81 'src/WebRequestJsObject.cpp', | 50 'src/WebRequestJsObject.cpp', |
| 82 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' | 51 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' |
| 83 ], | 52 ], |
| 84 'direct_dependent_settings': { | 53 'direct_dependent_settings': { |
| 85 'include_dirs': ['include'], | 54 'include_dirs': ['include'], |
| 86 'msvs_settings': { | 55 'conditions': [[ |
| 87 'VCLinkerTool': { | 56 'OS=="win"', { |
|
sergei
2017/07/20 10:23:00
this condition is needed because otherwise libv8_l
| |
| 88 'AdditionalLibraryDirectories': ['v8/build/<(CONFIGURATION_NAME)'], | 57 'msvs_settings': { |
| 58 'VCLinkerTool': { | |
| 59 'AdditionalLibraryDirectories': ['<(libv8_lib_dir)'], | |
| 60 } | |
| 61 } | |
| 89 } | 62 } |
| 90 }, | 63 ]], |
| 91 }, | 64 }, |
| 92 'conditions': [ | 65 'conditions': [ |
| 93 ['OS=="linux" or OS=="mac"', { | 66 ['OS=="linux" or OS=="mac"', { |
| 94 'link_settings': { | 67 'link_settings': { |
| 95 'libraries': [ | 68 'libraries': [ |
| 96 'v8/out/<(CONFIGURATION_NAME)/libv8_libplatform.a', | 69 '<@(libv8_libs)' |
| 97 'v8/out/<(CONFIGURATION_NAME)/libv8_base.a', | 70 ], |
| 98 'v8/out/<(CONFIGURATION_NAME)/libv8_snapshot.a', | |
| 99 'v8/out/<(CONFIGURATION_NAME)/libv8_libbase.a', | |
| 100 'v8/out/<(CONFIGURATION_NAME)/libv8_libsampler.a', | |
| 101 ] | |
| 102 } | 71 } |
| 103 }], | 72 }], |
| 104 ['OS=="win"', { | 73 ['OS=="win"', { |
| 105 'dependencies': ['build-v8'], | |
| 106 'link_settings': { | 74 'link_settings': { |
| 107 'libraries': [ | 75 'libraries': [ |
| 108 '-lv8_libplatform', | 76 '<@(libv8_libs)', |
| 109 '-lv8_base_0', | |
| 110 '-lv8_base_1', | |
| 111 '-lv8_base_2', | |
| 112 '-lv8_base_3', | |
| 113 '-lv8_libbase', | |
| 114 '-lv8_libsampler', | |
| 115 '-lv8_snapshot', | |
| 116 '-lwinmm' | 77 '-lwinmm' |
| 117 ], | 78 ], |
| 118 }, | 79 }, |
| 119 }], | 80 }], |
| 120 ['OS=="android"', { | 81 ['OS=="android"', { |
| 121 'user_libraries': [ | 82 'user_libraries': [ |
| 122 'android_<(target_arch).release/libv8_libplatform.a', | 83 '<@(libv8_libs)' |
| 123 'android_<(target_arch).release/libv8_base.a', | |
| 124 'android_<(target_arch).release/libv8_snapshot.a', | |
| 125 'android_<(target_arch).release/libv8_libbase.a', | |
| 126 'android_<(target_arch).release/libv8_libsampler.a', | |
| 127 ], | 84 ], |
| 128 'standalone_static_library': 1, # disable thin archives | 85 'standalone_static_library': 1, # disable thin archives |
| 129 }], | 86 }], |
| 130 ['have_curl==1', | 87 ['have_curl==1', |
| 131 { | 88 { |
| 132 'sources': [ | 89 'sources': [ |
| 133 'src/DefaultWebRequestCurl.cpp', | 90 'src/DefaultWebRequestCurl.cpp', |
| 134 ], | 91 ], |
| 135 'link_settings': { | 92 'link_settings': { |
| 136 'libraries': ['-lcurl'] | 93 'libraries': ['-lcurl'] |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 242 'test/WebRequest.cpp' | 199 'test/WebRequest.cpp' |
| 243 ], | 200 ], |
| 244 'msvs_settings': { | 201 'msvs_settings': { |
| 245 'VCLinkerTool': { | 202 'VCLinkerTool': { |
| 246 'SubSystem': '1', # Console | 203 'SubSystem': '1', # Console |
| 247 'EntryPointSymbol': 'mainCRTStartup', | 204 'EntryPointSymbol': 'mainCRTStartup', |
| 248 }, | 205 }, |
| 249 }, | 206 }, |
| 250 }] | 207 }] |
| 251 } | 208 } |
| OLD | NEW |