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

Side by Side Diff: adblockplus.gyp

Issue 29324576: Issue 2599, 2940 - Fix the presence of correct ATL version (Closed)
Patch Set: add tested environments Created Aug. 26, 2015, 9:44 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« README.md ('K') | « README.md ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'includes': [ 2 'includes': [
3 'defaults.gypi', 3 'defaults.gypi',
4 'common/common.gypi', 4 'common/common.gypi',
5 ], 5 ],
6 6
7 'variables': { 7 'variables': {
8 'build_type%': 'devbuild', 8 'build_type%': 'devbuild',
9 'build_version%': '', 9 'build_version%': '',
10 }, 10 },
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 'src/shared/Communication.cpp', 45 'src/shared/Communication.cpp',
46 'src/shared/Communication.h', 46 'src/shared/Communication.h',
47 'src/shared/CriticalSection.h', 47 'src/shared/CriticalSection.h',
48 'src/shared/Dictionary.cpp', 48 'src/shared/Dictionary.cpp',
49 'src/shared/Dictionary.h', 49 'src/shared/Dictionary.h',
50 'src/shared/Utils.cpp', 50 'src/shared/Utils.cpp',
51 'src/shared/Utils.h', 51 'src/shared/Utils.h',
52 'src/shared/Version.h', 52 'src/shared/Version.h',
53 'src/shared/MsHTMLUtils.cpp', 53 'src/shared/MsHTMLUtils.cpp',
54 'src/shared/MsHTMLUtils.h', 54 'src/shared/MsHTMLUtils.h',
55 ] 55 ],
56 'include_dirs': [
57 '$(WindowsSDK_IncludePath)',
Eric 2015/10/08 14:36:36 We don't need any of the "WindowsSDK_*" environmen
sergei 2015/10/21 11:55:50 Done.
58 '$(VCInstallDir_120)/atlmfc/include',
59 ],
56 }, 60 },
57 61
58 { 62 {
59 'target_name': 'AdblockPlusEngine', 63 'target_name': 'AdblockPlusEngine',
60 'type': 'executable', 64 'type': 'executable',
61 'dependencies': [ 65 'dependencies': [
62 'shared', 66 'shared',
63 'libadblockplus/libadblockplus.gyp:libadblockplus', 67 'libadblockplus/libadblockplus.gyp:libadblockplus',
64 ], 68 ],
65 'sources': [ 69 'sources': [
66 'src/engine/Main.cpp', 70 'src/engine/Main.cpp',
67 'src/engine/NotificationWindow.cpp', 71 'src/engine/NotificationWindow.cpp',
68 'src/engine/NotificationWindow.h', 72 'src/engine/NotificationWindow.h',
69 'src/engine/Debug.cpp', 73 'src/engine/Debug.cpp',
70 'src/engine/UpdateInstallDialog.cpp', 74 'src/engine/UpdateInstallDialog.cpp',
71 'src/engine/Updater.cpp', 75 'src/engine/Updater.cpp',
72 'src/engine/engine.rc', 76 'src/engine/engine.rc',
73 ], 77 ],
78 'include_dirs': [
79 '$(WindowsSDK_IncludePath)',
80 '$(VCInstallDir_120)/atlmfc/include',
81 ],
74 'libraries': [ 82 'libraries': [
75 '-ladvapi32', 83 '-ladvapi32',
76 '-lole32', 84 '-lole32',
77 '-luser32', 85 '-luser32',
78 '-lshell32', 86 '-lshell32',
79 '-lshlwapi', 87 '-lshlwapi',
80 ], 88 ],
81 'msbuild_toolset': 'v110_xp', 89 'msbuild_toolset': 'v110_xp',
82 'msvs_settings': { 90 'msvs_settings': {
83 'VCLinkerTool': { 91 'VCLinkerTool': {
84 'DelayLoadDLLs': ['Shell32.dll'], 92 'DelayLoadDLLs': ['Shell32.dll'],
93 'conditions': [[
94 'target_arch=="ia32"', {
95 'AdditionalLibraryDirectories': [
96 '$(WindowsSDK_LibraryPath_x86)',
97 '$(VCInstallDir_120)/atlmfc/lib',
98 ],
99 }, {
100 'AdditionalLibraryDirectories': [
101 '$(WindowsSDK_LibraryPath_x64)',
102 '$(VCInstallDir_120)/atlmfc/lib/amd64',
103 ],
104 }
105 ]],
106 'DelayLoadDLLs': ['Shell32.dll'],
Eric 2015/10/08 14:36:36 This line seems to be duplicated.
sergei 2015/10/21 11:55:50 Done.
85 }, 107 },
86 }, 108 },
87 }, 109 },
88 110
89 { 111 {
90 'target_name': 'AdblockPlus', 112 'target_name': 'AdblockPlus',
91 'type': 'shared_library', 113 'type': 'shared_library',
92 'dependencies': [ 114 'dependencies': [
93 'shared', 115 'shared',
94 'libadblockplus/libadblockplus.gyp:libadblockplus', 116 'libadblockplus/libadblockplus.gyp:libadblockplus',
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 'src/plugin/ProtocolCF.h', 167 'src/plugin/ProtocolCF.h',
146 'src/plugin/ProtocolCF.inl', 168 'src/plugin/ProtocolCF.inl',
147 'src/plugin/ProtocolImpl.h', 169 'src/plugin/ProtocolImpl.h',
148 'src/plugin/ProtocolImpl.inl', 170 'src/plugin/ProtocolImpl.inl',
149 'src/plugin/Resource.h', 171 'src/plugin/Resource.h',
150 'src/plugin/SinkPolicy.h', 172 'src/plugin/SinkPolicy.h',
151 'src/plugin/SinkPolicy.inl', 173 'src/plugin/SinkPolicy.inl',
152 ], 174 ],
153 'include_dirs': [ 175 'include_dirs': [
154 '$(WindowsSDK_IncludePath)', 176 '$(WindowsSDK_IncludePath)',
155 '$(VCInstallDir)atlmfc/include', 177 '$(VCInstallDir_120)/atlmfc/include',
156 '$(WINDDKDIR)/inc/atl71',
Eric 2015/10/08 14:36:35 The DDK directory illustrates why the SDK paths ca
157 ], 178 ],
158 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL 179 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL
159 # That Is Brought into a Process" on the link here: 180 # That Is Brought into a Process" on the link here:
160 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests 181 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests
161 'defines': ['ISOLATION_AWARE_ENABLED'], 182 'defines': ['ISOLATION_AWARE_ENABLED'],
162 'libraries': [ 183 'libraries': [
163 '-lwinhttp', 184 '-lwinhttp',
164 '-lshell32', 185 '-lshell32',
165 '-lComctl32', 186 '-lComctl32',
166 '-lGdi32', 187 '-lGdi32',
167 ], 188 ],
168 'configurations': {
169 # 'libraries' is not allowed under 'configurations' :-(
170 'Debug': {
171 'msvs_settings': {
172 'VCLinkerTool': {
173 'AdditionalDependencies': ['atlsd.lib'],
174 },
175 },
176 },
177 'Release': {
178 'msvs_settings': {
179 'VCLinkerTool': {
180 'AdditionalDependencies': ['atls.lib'],
181 },
182 },
183 },
184 },
185 'msvs_settings': { 189 'msvs_settings': {
186 'VCLinkerTool': { 190 'VCLinkerTool': {
187 'conditions': [[ 191 'conditions': [[
188 'target_arch=="ia32"', { 192 'target_arch=="ia32"', {
189 'AdditionalLibraryDirectories': [ 193 'AdditionalLibraryDirectories': [
190 '$(VCInstallDir)atlmfc/lib',
191 '$(WindowsSDK_LibraryPath_x86)', 194 '$(WindowsSDK_LibraryPath_x86)',
192 '$(WINDDKDIR)/lib/ATL/i386', 195 '$(VCInstallDir_120)/atlmfc/lib',
193 ], 196 ],
194 }, { 197 }, {
195 'AdditionalLibraryDirectories': [ 198 'AdditionalLibraryDirectories': [
196 '$(VCInstallDir)atlmfc/lib/amd64',
197 '$(WindowsSDK_LibraryPath_x64)', 199 '$(WindowsSDK_LibraryPath_x64)',
198 '$(WINDDKDIR)/lib/ATL/amd64', 200 '$(VCInstallDir_120)/atlmfc/lib/amd64',
199 ], 201 ],
200 } 202 }
201 ]], 203 ]],
202 'DelayLoadDLLs': ['Shell32.dll'], 204 'DelayLoadDLLs': ['Shell32.dll'],
203 }, 205 },
204 }, 206 },
205 }, 207 },
206 208
207 { 209 {
208 'target_name': 'tests', 210 'target_name': 'tests',
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 'src/plugin/PluginFilter.cpp', 259 'src/plugin/PluginFilter.cpp',
258 'src/plugin/PluginMimeFilterClient.cpp', 260 'src/plugin/PluginMimeFilterClient.cpp',
259 'src/plugin/PluginMutex.cpp', 261 'src/plugin/PluginMutex.cpp',
260 'src/plugin/PluginSettings.cpp', 262 'src/plugin/PluginSettings.cpp',
261 'src/plugin/PluginSystem.cpp', 263 'src/plugin/PluginSystem.cpp',
262 'src/plugin/PluginTabBase.cpp', 264 'src/plugin/PluginTabBase.cpp',
263 'src/plugin/PluginUtil.cpp', 265 'src/plugin/PluginUtil.cpp',
264 'src/plugin/PluginWbPassthrough.cpp', 266 'src/plugin/PluginWbPassthrough.cpp',
265 ], 267 ],
266 'include_dirs': [ 268 'include_dirs': [
267 '$(WINDDKDIR)/inc/atl71', 269 '$(WindowsSDK_IncludePath)',
270 '$(VCInstallDir_120)/atlmfc/include',
268 ], 271 ],
269 'defines': [ 272 'defines': [
270 'WINVER=0x0501', 273 'WINVER=0x0501',
271 'PRODUCT_ADBLOCKPLUS' 274 'PRODUCT_ADBLOCKPLUS'
272 ], 275 ],
273 'link_settings': { 276 'link_settings': {
274 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '], 277 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '],
275 }, 278 },
276 'msvs_settings': { 279 'msvs_settings': {
277 'VCLinkerTool': { 280 'VCLinkerTool': {
278 'SubSystem': '1', # Console 281 'SubSystem': '1', # Console
279 'EntryPointSymbol': 'mainCRTStartup', 282 'EntryPointSymbol': 'mainCRTStartup',
280 'conditions': [[ 283 'conditions': [[
281 'target_arch=="ia32"', { 284 'target_arch=="ia32"', {
282 'AdditionalLibraryDirectories': [ 285 'AdditionalLibraryDirectories': [
283 '$(VCInstallDir)atlmfc/lib',
284 '$(WindowsSDK_LibraryPath_x86)', 286 '$(WindowsSDK_LibraryPath_x86)',
285 '$(WINDDKDIR)/lib/ATL/i386', 287 '$(VCInstallDir_120)/atlmfc/lib',
286 ], 288 ],
287 }, { 289 }, {
288 'AdditionalLibraryDirectories': [ 290 'AdditionalLibraryDirectories': [
289 '$(VCInstallDir)atlmfc/lib/amd64',
290 '$(WindowsSDK_LibraryPath_x64)', 291 '$(WindowsSDK_LibraryPath_x64)',
291 '$(WINDDKDIR)/lib/ATL/amd64', 292 '$(VCInstallDir_120)/atlmfc/lib/amd64',
292 ], 293 ],
293 } 294 }
294 ]], 295 ]],
295 }, 296 },
296 }, 297 },
297 'configurations': {
298 # 'libraries' is not allowed under 'configurations' :-(
299 'Debug': {
300 'msvs_settings': {
301 'VCLinkerTool': {
302 'AdditionalDependencies': ['atlsd.lib'],
303 },
304 },
305 },
306 'Release': {
307 'msvs_settings': {
308 'VCLinkerTool': {
309 'AdditionalDependencies': ['atls.lib'],
310 },
311 },
312 },
313 },
314 }] 298 }]
315 } 299 }
OLDNEW
« README.md ('K') | « README.md ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld