Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: adblockplus.gyp

Issue 29324576: Issue 2599, 2940 - Fix the presence of correct ATL version (Closed)
Patch Set: Created Aug. 25, 2015, 1:11 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« README.md ('K') | « README.md ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: adblockplus.gyp
===================================================================
--- a/adblockplus.gyp
+++ b/adblockplus.gyp
@@ -52,7 +52,11 @@
'src/shared/Version.h',
'src/shared/MsHTMLUtils.cpp',
'src/shared/MsHTMLUtils.h',
- ]
+ ],
+ 'include_dirs': [
+ '$(WindowsSDK_IncludePath)',
+ '$(VCInstallDir_120)/atlmfc/include',
Eric 2015/08/26 18:25:35 Nope. Visual Studio 2013 Community does not have
+ ],
},
{
@@ -71,6 +75,10 @@
'src/engine/Updater.cpp',
'src/engine/engine.rc',
],
+ 'include_dirs': [
+ '$(WindowsSDK_IncludePath)',
+ '$(VCInstallDir_120)/atlmfc/include',
+ ],
'libraries': [
'-ladvapi32',
'-lole32',
@@ -82,6 +90,20 @@
'msvs_settings': {
'VCLinkerTool': {
'DelayLoadDLLs': ['Shell32.dll'],
+ 'conditions': [[
+ 'target_arch=="ia32"', {
+ 'AdditionalLibraryDirectories': [
+ '$(WindowsSDK_LibraryPath_x86)',
+ '$(VCInstallDir_120)/atlmfc/lib',
+ ],
+ }, {
+ 'AdditionalLibraryDirectories': [
+ '$(WindowsSDK_LibraryPath_x64)',
+ '$(VCInstallDir_120)/atlmfc/lib/amd64',
+ ],
+ }
+ ]],
+ 'DelayLoadDLLs': ['Shell32.dll'],
},
},
},
@@ -152,8 +174,7 @@
],
'include_dirs': [
'$(WindowsSDK_IncludePath)',
- '$(VCInstallDir)atlmfc/include',
- '$(WINDDKDIR)/inc/atl71',
+ '$(VCInstallDir_120)/atlmfc/include',
],
# See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL
# That Is Brought into a Process" on the link here:
@@ -165,37 +186,18 @@
'-lComctl32',
'-lGdi32',
],
- 'configurations': {
- # 'libraries' is not allowed under 'configurations' :-(
- 'Debug': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalDependencies': ['atlsd.lib'],
- },
- },
- },
- 'Release': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalDependencies': ['atls.lib'],
- },
- },
- },
- },
'msvs_settings': {
'VCLinkerTool': {
'conditions': [[
'target_arch=="ia32"', {
'AdditionalLibraryDirectories': [
- '$(VCInstallDir)atlmfc/lib',
'$(WindowsSDK_LibraryPath_x86)',
- '$(WINDDKDIR)/lib/ATL/i386',
+ '$(VCInstallDir_120)/atlmfc/lib',
],
}, {
'AdditionalLibraryDirectories': [
- '$(VCInstallDir)atlmfc/lib/amd64',
'$(WindowsSDK_LibraryPath_x64)',
- '$(WINDDKDIR)/lib/ATL/amd64',
+ '$(VCInstallDir_120)/atlmfc/lib/amd64',
],
}
]],
@@ -264,7 +266,8 @@
'src/plugin/PluginWbPassthrough.cpp',
],
'include_dirs': [
- '$(WINDDKDIR)/inc/atl71',
+ '$(WindowsSDK_IncludePath)',
+ '$(VCInstallDir_120)/atlmfc/include',
],
'defines': [
'WINVER=0x0501',
@@ -280,36 +283,17 @@
'conditions': [[
'target_arch=="ia32"', {
'AdditionalLibraryDirectories': [
- '$(VCInstallDir)atlmfc/lib',
'$(WindowsSDK_LibraryPath_x86)',
- '$(WINDDKDIR)/lib/ATL/i386',
+ '$(VCInstallDir_120)/atlmfc/lib',
],
}, {
'AdditionalLibraryDirectories': [
- '$(VCInstallDir)atlmfc/lib/amd64',
'$(WindowsSDK_LibraryPath_x64)',
- '$(WINDDKDIR)/lib/ATL/amd64',
+ '$(VCInstallDir_120)/atlmfc/lib/amd64',
],
}
]],
},
},
- 'configurations': {
- # 'libraries' is not allowed under 'configurations' :-(
- 'Debug': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalDependencies': ['atlsd.lib'],
- },
- },
- },
- 'Release': {
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'AdditionalDependencies': ['atls.lib'],
- },
- },
- },
- },
}]
}
« README.md ('K') | « README.md ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld