| Left: | ||
| Right: |
| 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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 210 'defines': ['WINVER=0x0501'], | 210 'defines': ['WINVER=0x0501'], |
| 211 'link_settings': { | 211 'link_settings': { |
| 212 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], | 212 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], |
| 213 }, | 213 }, |
| 214 'msvs_settings': { | 214 'msvs_settings': { |
| 215 'VCLinkerTool': { | 215 'VCLinkerTool': { |
| 216 'SubSystem': '1', # Console | 216 'SubSystem': '1', # Console |
| 217 'EntryPointSymbol': 'mainCRTStartup', | 217 'EntryPointSymbol': 'mainCRTStartup', |
| 218 }, | 218 }, |
| 219 }, | 219 }, |
| 220 }, | |
| 221 | |
| 222 { | |
|
Felix Dahlke
2014/09/30 13:50:59
Not really a fan of duplicating source listing, in
Eric
2014/10/07 16:58:10
You noticed part of what was bothering me when I o
Felix Dahlke
2014/11/03 04:21:56
I'd generally find a static library cleaner, but I
| |
| 223 'target_name': 'tests_plugin', | |
| 224 'type': 'executable', | |
| 225 'dependencies': [ | |
| 226 'shared', | |
| 227 'libadblockplus/third_party/googletest.gyp:googletest_main', | |
| 228 ], | |
| 229 'sources': [ | |
| 230 'src/plugin/PluginUserSettings.cpp', | |
| 231 'src/plugin/PluginUserSettings.h', | |
| 232 'test/plugin/UserSettingsTest.cpp', | |
| 233 # | |
| 234 # required only for linking | |
| 235 # | |
| 236 'src/plugin/AdblockPlusClient.cpp', | |
| 237 'src/plugin/AdblockPlusDomTraverser.cpp', | |
| 238 'src/plugin/AdblockPlusTab.cpp', | |
| 239 'src/plugin/ATL_Deprecate.cpp', | |
| 240 'src/plugin/NotificationMessage.cpp', | |
| 241 'src/plugin/Plugin.cpp', | |
| 242 'src/plugin/PluginClientBase.cpp', | |
| 243 'src/plugin/PluginClientFactory.cpp', | |
| 244 'src/plugin/PluginClass.cpp', | |
| 245 'src/plugin/PluginDebug.cpp', | |
| 246 'src/plugin/PluginFilter.cpp', | |
| 247 'src/plugin/PluginMimeFilterClient.cpp', | |
| 248 'src/plugin/PluginMutex.cpp', | |
| 249 'src/plugin/PluginSettings.cpp', | |
| 250 'src/plugin/PluginSystem.cpp', | |
| 251 'src/plugin/PluginTabBase.cpp', | |
| 252 'src/plugin/PluginUtil.cpp', | |
| 253 'src/plugin/PluginWbPassthrough.cpp', | |
| 254 ], | |
| 255 'include_dirs': [ | |
| 256 '$(WINDDKDIR)/inc/atl71', | |
| 257 ], | |
| 258 'defines': [ | |
| 259 'WINVER=0x0501', | |
| 260 'PRODUCT_ADBLOCKPLUS' | |
| 261 ], | |
| 262 'link_settings': { | |
| 263 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '], | |
| 264 }, | |
| 265 'msvs_settings': { | |
| 266 'VCLinkerTool': { | |
| 267 'SubSystem': '1', # Console | |
| 268 'EntryPointSymbol': 'mainCRTStartup', | |
| 269 'conditions': [[ | |
| 270 'target_arch=="ia32"', { | |
| 271 'AdditionalLibraryDirectories': [ | |
| 272 '$(VCInstallDir)atlmfc/lib', | |
| 273 '$(WindowsSDK_LibraryPath_x86)', | |
| 274 '$(WINDDKDIR)/lib/ATL/i386', | |
| 275 ], | |
| 276 }, { | |
| 277 'AdditionalLibraryDirectories': [ | |
| 278 '$(VCInstallDir)atlmfc/lib/amd64', | |
| 279 '$(WindowsSDK_LibraryPath_x64)', | |
| 280 '$(WINDDKDIR)/lib/ATL/amd64', | |
| 281 ], | |
| 282 } | |
| 283 ]], | |
| 284 }, | |
| 285 }, | |
| 286 'configurations': { | |
| 287 # 'libraries' is not allowed under 'configurations' :-( | |
| 288 'Debug': { | |
| 289 'msvs_settings': { | |
| 290 'VCLinkerTool': { | |
| 291 'AdditionalDependencies': ['atlsd.lib'], | |
| 292 }, | |
| 293 }, | |
| 294 }, | |
| 295 'Release': { | |
| 296 'msvs_settings': { | |
| 297 'VCLinkerTool': { | |
| 298 'AdditionalDependencies': ['atls.lib'], | |
| 299 }, | |
| 300 }, | |
| 301 }, | |
| 302 }, | |
| 220 }] | 303 }] |
| 221 } | 304 } |
| OLD | NEW |