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: address comments Created Dec. 2, 2015, 9:52 a.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
diff --git a/adblockplus.gyp b/adblockplus.gyp
index 33e141d79f41cdb9ae8df5bef36180e7d29e4ed2..80d92a6e88503137d21c8c6217f4a9d995675452 100644
--- a/adblockplus.gyp
+++ b/adblockplus.gyp
@@ -52,7 +52,10 @@
'src/shared/Version.h',
'src/shared/MsHTMLUtils.cpp',
'src/shared/MsHTMLUtils.h',
- ]
+ ],
+ 'include_dirs': [
+ '$(ADBLOCKPLUS_ATL)/include',
+ ],
},
{
@@ -71,6 +74,9 @@
'src/engine/Updater.cpp',
'src/engine/engine.rc',
],
+ 'include_dirs': [
+ '$(ADBLOCKPLUS_ATL)/include',
+ ],
'libraries': [
'-ladvapi32',
'-lole32',
@@ -82,6 +88,17 @@
'msvs_settings': {
'VCLinkerTool': {
'DelayLoadDLLs': ['Shell32.dll'],
+ 'conditions': [[
+ 'target_arch=="ia32"', {
+ 'AdditionalLibraryDirectories': [
+ '$(ADBLOCKPLUS_ATL)/lib',
+ ],
+ }, {
+ 'AdditionalLibraryDirectories': [
+ '$(ADBLOCKPLUS_ATL)/lib/amd64',
+ ],
+ }
+ ]],
},
},
},
@@ -151,9 +168,7 @@
'src/plugin/passthroughapp/SinkPolicy.inl',
],
'include_dirs': [
- '$(WindowsSDK_IncludePath)',
- '$(VCInstallDir)atlmfc/include',
- '$(WINDDKDIR)/inc/atl71',
+ '$(ADBLOCKPLUS_ATL)/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 +180,16 @@
'-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',
+ '$(ADBLOCKPLUS_ATL)/lib',
],
}, {
'AdditionalLibraryDirectories': [
- '$(VCInstallDir)atlmfc/lib/amd64',
- '$(WindowsSDK_LibraryPath_x64)',
- '$(WINDDKDIR)/lib/ATL/amd64',
+ '$(ADBLOCKPLUS_ATL)/lib/amd64',
],
}
]],
@@ -266,7 +260,7 @@
'src/plugin/PluginWbPassthrough.cpp',
],
'include_dirs': [
- '$(WINDDKDIR)/inc/atl71',
+ '$(ADBLOCKPLUS_ATL)/include',
],
'defines': [
'WINVER=0x0501',
@@ -282,36 +276,15 @@
'conditions': [[
'target_arch=="ia32"', {
'AdditionalLibraryDirectories': [
- '$(VCInstallDir)atlmfc/lib',
- '$(WindowsSDK_LibraryPath_x86)',
- '$(WINDDKDIR)/lib/ATL/i386',
+ '$(ADBLOCKPLUS_ATL)/lib',
],
}, {
'AdditionalLibraryDirectories': [
- '$(VCInstallDir)atlmfc/lib/amd64',
- '$(WindowsSDK_LibraryPath_x64)',
- '$(WINDDKDIR)/lib/ATL/amd64',
+ '$(ADBLOCKPLUS_ATL)/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