Side by Side Diff: adblockplus.gyp
Issue 5171515343503360:
Issue #41 - Bring method of determining IE version up to date (Closed)
Patch Set: Final (?) 2
Created Jan. 5, 2015, 1:02 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
src/engine/Main.cpp » ('j')
|
src/plugin/PluginWbPassThrough.cpp » ('J')
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 'includes': ['defaults.gypi'], | 2 'includes': ['defaults.gypi'], |
| 3 | 3 |
| 4 'variables': { | 4 'variables': { |
| 5 'build_type%': 'devbuild', | 5 'build_type%': 'devbuild', |
| 6 'build_version%': '', | 6 'build_version%': '', |
| 7 }, | 7 }, |
| 8 | 8 |
| 9 'target_defaults': { | 9 'target_defaults': { |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 31 }, | 31 }, |
| 32 | 32 |
| 33 'targets': [{ | 33 'targets': [{ |
| 34 'target_name': 'shared', | 34 'target_name': 'shared', |
| 35 'type': 'static_library', | 35 'type': 'static_library', |
| 36 'sources': [ | 36 'sources': [ |
| 37 'src/shared/AutoHandle.cpp', | 37 'src/shared/AutoHandle.cpp', |
| 38 'src/shared/Communication.cpp', | 38 'src/shared/Communication.cpp', |
| 39 'src/shared/Dictionary.cpp', | 39 'src/shared/Dictionary.cpp', |
| 40 'src/shared/Utils.cpp', | 40 'src/shared/Utils.cpp', |
| 41 'src/shared/Registry.h', | |
| 42 'src/shared/Registry.cpp', | |
| 43 'src/shared/IE_version.h', | |
| 44 'src/shared/IE_version.cpp', | |
| 41 ] | 45 ] |
| 42 }, | 46 }, |
| 43 | 47 |
| 44 { | 48 { |
| 45 'target_name': 'AdblockPlusEngine', | 49 'target_name': 'AdblockPlusEngine', |
| 46 'type': 'executable', | 50 'type': 'executable', |
| 47 'dependencies': [ | 51 'dependencies': [ |
| 48 'shared', | 52 'shared', |
| 49 'libadblockplus/libadblockplus.gyp:libadblockplus', | 53 'libadblockplus/libadblockplus.gyp:libadblockplus', |
| 50 ], | 54 ], |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 198 { | 202 { |
| 199 'target_name': 'tests', | 203 'target_name': 'tests', |
| 200 'type': 'executable', | 204 'type': 'executable', |
| 201 'dependencies': [ | 205 'dependencies': [ |
| 202 'shared', | 206 'shared', |
| 203 'libadblockplus/third_party/googletest.gyp:googletest_main', | 207 'libadblockplus/third_party/googletest.gyp:googletest_main', |
| 204 ], | 208 ], |
| 205 'sources': [ | 209 'sources': [ |
| 206 'test/CommunicationTest.cpp', | 210 'test/CommunicationTest.cpp', |
| 207 'test/DictionaryTest.cpp', | 211 'test/DictionaryTest.cpp', |
| 212 'test/RegistryTest.cpp', | |
| 208 ], | 213 ], |
| 209 'defines': ['WINVER=0x0501'], | 214 'defines': ['WINVER=0x0501'], |
| 210 'link_settings': { | 215 'link_settings': { |
| 211 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], | 216 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], |
| 212 }, | 217 }, |
| 213 'msvs_settings': { | 218 'msvs_settings': { |
| 214 'VCLinkerTool': { | 219 'VCLinkerTool': { |
| 215 'SubSystem': '1', # Console | 220 'SubSystem': '1', # Console |
| 216 'EntryPointSymbol': 'mainCRTStartup', | 221 'EntryPointSymbol': 'mainCRTStartup', |
| 217 }, | 222 }, |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 294 'Release': { | 299 'Release': { |
| 295 'msvs_settings': { | 300 'msvs_settings': { |
| 296 'VCLinkerTool': { | 301 'VCLinkerTool': { |
| 297 'AdditionalDependencies': ['atls.lib'], | 302 'AdditionalDependencies': ['atls.lib'], |
| 298 }, | 303 }, |
| 299 }, | 304 }, |
| 300 }, | 305 }, |
| 301 }, | 306 }, |
| 302 }] | 307 }] |
| 303 } | 308 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
src/engine/Main.cpp » ('j')
|
src/plugin/PluginWbPassThrough.cpp » ('J')
