| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 'conditions': [ | 47 'conditions': [ |
| 48 ['OS=="android"', { | 48 ['OS=="android"', { |
| 49 'link_settings': { | 49 'link_settings': { |
| 50 'libraries': [ | 50 'libraries': [ |
| 51 'android_arm.release/obj.target/tools/gyp/libv8_base.a', | 51 'android_arm.release/obj.target/tools/gyp/libv8_base.a', |
| 52 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a', | 52 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a', |
| 53 ], | 53 ], |
| 54 }, | 54 }, |
| 55 'standalone_static_library': 1, # disable thin archives | 55 'standalone_static_library': 1, # disable thin archives |
| 56 }, { | 56 }, { |
| 57 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 57 'dependencies': [ |
| 58 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 58 'third_party/v8/tools/gyp/v8.gyp:v8', |
| 59 'third_party/v8/tools/gyp/v8.gyp:v8_libplatform', |
| 60 ], |
| 61 'export_dependent_settings': [ |
| 62 'third_party/v8/tools/gyp/v8.gyp:v8', |
| 63 'third_party/v8/tools/gyp/v8.gyp:v8_libplatform', |
| 64 ], |
| 59 }], | 65 }], |
| 60 ['have_curl==1', | 66 ['have_curl==1', |
| 61 { | 67 { |
| 62 'sources': [ | 68 'sources': [ |
| 63 'src/DefaultWebRequestCurl.cpp', | 69 'src/DefaultWebRequestCurl.cpp', |
| 64 ], | 70 ], |
| 65 'link_settings': { | 71 'link_settings': { |
| 66 'libraries': ['-lcurl'] | 72 'libraries': ['-lcurl'] |
| 67 }, | 73 }, |
| 68 'all_dependent_settings': { | 74 'all_dependent_settings': { |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 '--convert', '<@(library_files)', | 144 '--convert', '<@(library_files)', |
| 139 '--after', '<@(load_after_files)', | 145 '--after', '<@(load_after_files)', |
| 140 ] | 146 ] |
| 141 }] | 147 }] |
| 142 }, | 148 }, |
| 143 { | 149 { |
| 144 'target_name': 'tests', | 150 'target_name': 'tests', |
| 145 'type': 'executable', | 151 'type': 'executable', |
| 146 'dependencies': [ | 152 'dependencies': [ |
| 147 'third_party/googletest.gyp:googletest_main', | 153 'third_party/googletest.gyp:googletest_main', |
| 148 'libadblockplus' | 154 'libadblockplus', |
| 149 ], | 155 ], |
| 150 'sources': [ | 156 'sources': [ |
| 151 'test/AppInfoJsObject.cpp', | 157 'test/AppInfoJsObject.cpp', |
| 152 'test/ConsoleJsObject.cpp', | 158 'test/ConsoleJsObject.cpp', |
| 153 'test/DefaultFileSystem.cpp', | 159 'test/DefaultFileSystem.cpp', |
| 154 'test/FileSystemJsObject.cpp', | 160 'test/FileSystemJsObject.cpp', |
| 155 'test/FilterEngine.cpp', | 161 'test/FilterEngine.cpp', |
| 156 'test/GlobalJsObject.cpp', | 162 'test/GlobalJsObject.cpp', |
| 157 'test/JsEngine.cpp', | 163 'test/JsEngine.cpp', |
| 158 'test/JsValue.cpp', | 164 'test/JsValue.cpp', |
| 159 'test/Prefs.cpp', | 165 'test/Prefs.cpp', |
| 160 'test/ReferrerMapping.cpp', | 166 'test/ReferrerMapping.cpp', |
| 161 'test/Thread.cpp', | 167 'test/Thread.cpp', |
| 162 'test/UpdateCheck.cpp', | 168 'test/UpdateCheck.cpp', |
| 163 'test/WebRequest.cpp' | 169 'test/WebRequest.cpp' |
| 164 ], | 170 ], |
| 165 'msvs_settings': { | 171 'msvs_settings': { |
| 166 'VCLinkerTool': { | 172 'VCLinkerTool': { |
| 167 'SubSystem': '1', # Console | 173 'SubSystem': '1', # Console |
| 168 'EntryPointSymbol': 'mainCRTStartup', | 174 'EntryPointSymbol': 'mainCRTStartup', |
| 169 }, | 175 }, |
| 170 }, | 176 }, |
| 171 'xcode_settings': { | 177 'xcode_settings': { |
| 172 'OTHER_LDFLAGS': ['-stdlib=libstdc++'], | 178 'OTHER_LDFLAGS': ['-stdlib=libstdc++'], |
| 173 }, | 179 }, |
| 174 }] | 180 }] |
| 175 } | 181 } |
| OLD | NEW |