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: address comments Created Dec. 2, 2015, 9:52 a.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 '$(ADBLOCKPLUS_ATL)/include',
58 ],
56 }, 59 },
57 60
58 { 61 {
59 'target_name': 'AdblockPlusEngine', 62 'target_name': 'AdblockPlusEngine',
60 'type': 'executable', 63 'type': 'executable',
61 'dependencies': [ 64 'dependencies': [
62 'shared', 65 'shared',
63 'libadblockplus/libadblockplus.gyp:libadblockplus', 66 'libadblockplus/libadblockplus.gyp:libadblockplus',
64 ], 67 ],
65 'sources': [ 68 'sources': [
66 'src/engine/Main.cpp', 69 'src/engine/Main.cpp',
67 'src/engine/NotificationWindow.cpp', 70 'src/engine/NotificationWindow.cpp',
68 'src/engine/NotificationWindow.h', 71 'src/engine/NotificationWindow.h',
69 'src/engine/Debug.cpp', 72 'src/engine/Debug.cpp',
70 'src/engine/UpdateInstallDialog.cpp', 73 'src/engine/UpdateInstallDialog.cpp',
71 'src/engine/Updater.cpp', 74 'src/engine/Updater.cpp',
72 'src/engine/engine.rc', 75 'src/engine/engine.rc',
73 ], 76 ],
77 'include_dirs': [
78 '$(ADBLOCKPLUS_ATL)/include',
79 ],
74 'libraries': [ 80 'libraries': [
75 '-ladvapi32', 81 '-ladvapi32',
76 '-lole32', 82 '-lole32',
77 '-luser32', 83 '-luser32',
78 '-lshell32', 84 '-lshell32',
79 '-lshlwapi', 85 '-lshlwapi',
80 ], 86 ],
81 'msbuild_toolset': 'v110_xp', 87 'msbuild_toolset': 'v110_xp',
82 'msvs_settings': { 88 'msvs_settings': {
83 'VCLinkerTool': { 89 'VCLinkerTool': {
84 'DelayLoadDLLs': ['Shell32.dll'], 90 'DelayLoadDLLs': ['Shell32.dll'],
91 'conditions': [[
92 'target_arch=="ia32"', {
93 'AdditionalLibraryDirectories': [
94 '$(ADBLOCKPLUS_ATL)/lib',
95 ],
96 }, {
97 'AdditionalLibraryDirectories': [
98 '$(ADBLOCKPLUS_ATL)/lib/amd64',
99 ],
100 }
101 ]],
85 }, 102 },
86 }, 103 },
87 }, 104 },
88 105
89 { 106 {
90 'target_name': 'AdblockPlus', 107 'target_name': 'AdblockPlus',
91 'type': 'shared_library', 108 'type': 'shared_library',
92 'dependencies': [ 109 'dependencies': [
93 'shared', 110 'shared',
94 'libadblockplus/libadblockplus.gyp:libadblockplus', 111 'libadblockplus/libadblockplus.gyp:libadblockplus',
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 'src/plugin/Resource.h', 161 'src/plugin/Resource.h',
145 'src/plugin/passthroughapp/PassthroughObject.h', 162 'src/plugin/passthroughapp/PassthroughObject.h',
146 'src/plugin/passthroughapp/ProtocolCF.h', 163 'src/plugin/passthroughapp/ProtocolCF.h',
147 'src/plugin/passthroughapp/ProtocolCF.inl', 164 'src/plugin/passthroughapp/ProtocolCF.inl',
148 'src/plugin/passthroughapp/ProtocolImpl.h', 165 'src/plugin/passthroughapp/ProtocolImpl.h',
149 'src/plugin/passthroughapp/ProtocolImpl.inl', 166 'src/plugin/passthroughapp/ProtocolImpl.inl',
150 'src/plugin/passthroughapp/SinkPolicy.h', 167 'src/plugin/passthroughapp/SinkPolicy.h',
151 'src/plugin/passthroughapp/SinkPolicy.inl', 168 'src/plugin/passthroughapp/SinkPolicy.inl',
152 ], 169 ],
153 'include_dirs': [ 170 'include_dirs': [
154 '$(WindowsSDK_IncludePath)', 171 '$(ADBLOCKPLUS_ATL)/include',
155 '$(VCInstallDir)atlmfc/include',
156 '$(WINDDKDIR)/inc/atl71',
157 ], 172 ],
158 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL 173 # 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: 174 # 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 175 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests
161 'defines': ['ISOLATION_AWARE_ENABLED'], 176 'defines': ['ISOLATION_AWARE_ENABLED'],
162 'libraries': [ 177 'libraries': [
163 '-lwinhttp', 178 '-lwinhttp',
164 '-lshell32', 179 '-lshell32',
165 '-lComctl32', 180 '-lComctl32',
166 '-lGdi32', 181 '-lGdi32',
167 ], 182 ],
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': { 183 'msvs_settings': {
186 'VCLinkerTool': { 184 'VCLinkerTool': {
187 'conditions': [[ 185 'conditions': [[
188 'target_arch=="ia32"', { 186 'target_arch=="ia32"', {
189 'AdditionalLibraryDirectories': [ 187 'AdditionalLibraryDirectories': [
190 '$(VCInstallDir)atlmfc/lib', 188 '$(ADBLOCKPLUS_ATL)/lib',
191 '$(WindowsSDK_LibraryPath_x86)',
192 '$(WINDDKDIR)/lib/ATL/i386',
193 ], 189 ],
194 }, { 190 }, {
195 'AdditionalLibraryDirectories': [ 191 'AdditionalLibraryDirectories': [
196 '$(VCInstallDir)atlmfc/lib/amd64', 192 '$(ADBLOCKPLUS_ATL)/lib/amd64',
197 '$(WindowsSDK_LibraryPath_x64)',
198 '$(WINDDKDIR)/lib/ATL/amd64',
199 ], 193 ],
200 } 194 }
201 ]], 195 ]],
202 'DelayLoadDLLs': ['Shell32.dll'], 196 'DelayLoadDLLs': ['Shell32.dll'],
203 }, 197 },
204 }, 198 },
205 }, 199 },
206 200
207 { 201 {
208 'target_name': 'tests', 202 'target_name': 'tests',
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 'src/plugin/PluginFilter.cpp', 253 'src/plugin/PluginFilter.cpp',
260 'src/plugin/PluginMimeFilterClient.cpp', 254 'src/plugin/PluginMimeFilterClient.cpp',
261 'src/plugin/PluginMutex.cpp', 255 'src/plugin/PluginMutex.cpp',
262 'src/plugin/PluginSettings.cpp', 256 'src/plugin/PluginSettings.cpp',
263 'src/plugin/PluginSystem.cpp', 257 'src/plugin/PluginSystem.cpp',
264 'src/plugin/PluginTabBase.cpp', 258 'src/plugin/PluginTabBase.cpp',
265 'src/plugin/PluginUtil.cpp', 259 'src/plugin/PluginUtil.cpp',
266 'src/plugin/PluginWbPassthrough.cpp', 260 'src/plugin/PluginWbPassthrough.cpp',
267 ], 261 ],
268 'include_dirs': [ 262 'include_dirs': [
269 '$(WINDDKDIR)/inc/atl71', 263 '$(ADBLOCKPLUS_ATL)/include',
270 ], 264 ],
271 'defines': [ 265 'defines': [
272 'WINVER=0x0501', 266 'WINVER=0x0501',
273 'PRODUCT_ADBLOCKPLUS' 267 'PRODUCT_ADBLOCKPLUS'
274 ], 268 ],
275 'link_settings': { 269 'link_settings': {
276 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '], 270 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '],
277 }, 271 },
278 'msvs_settings': { 272 'msvs_settings': {
279 'VCLinkerTool': { 273 'VCLinkerTool': {
280 'SubSystem': '1', # Console 274 'SubSystem': '1', # Console
281 'EntryPointSymbol': 'mainCRTStartup', 275 'EntryPointSymbol': 'mainCRTStartup',
282 'conditions': [[ 276 'conditions': [[
283 'target_arch=="ia32"', { 277 'target_arch=="ia32"', {
284 'AdditionalLibraryDirectories': [ 278 'AdditionalLibraryDirectories': [
285 '$(VCInstallDir)atlmfc/lib', 279 '$(ADBLOCKPLUS_ATL)/lib',
286 '$(WindowsSDK_LibraryPath_x86)',
287 '$(WINDDKDIR)/lib/ATL/i386',
288 ], 280 ],
289 }, { 281 }, {
290 'AdditionalLibraryDirectories': [ 282 'AdditionalLibraryDirectories': [
291 '$(VCInstallDir)atlmfc/lib/amd64', 283 '$(ADBLOCKPLUS_ATL)/lib/amd64',
292 '$(WindowsSDK_LibraryPath_x64)',
293 '$(WINDDKDIR)/lib/ATL/amd64',
294 ], 284 ],
295 } 285 }
296 ]], 286 ]],
297 }, 287 },
298 }, 288 },
299 'configurations': {
300 # 'libraries' is not allowed under 'configurations' :-(
301 'Debug': {
302 'msvs_settings': {
303 'VCLinkerTool': {
304 'AdditionalDependencies': ['atlsd.lib'],
305 },
306 },
307 },
308 'Release': {
309 'msvs_settings': {
310 'VCLinkerTool': {
311 'AdditionalDependencies': ['atls.lib'],
312 },
313 },
314 },
315 },
316 }] 289 }]
317 } 290 }
OLDNEW
« README.md ('K') | « README.md ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld