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

Side by Side Diff: adblockplus.gyp

Issue 6221488373891072: remove atlthunk library because there is no such library, and it works without it (Closed)
Patch Set: Created July 15, 2014, 8:48 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
« no previous file with comments | « no previous file | 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': ['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 'shared_files': [ 7 'shared_files': [
8 'src/shared/AutoHandle.cpp', 8 'src/shared/AutoHandle.cpp',
9 'src/shared/Communication.cpp', 9 'src/shared/Communication.cpp',
10 'src/shared/Dictionary.cpp', 10 'src/shared/Dictionary.cpp',
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 'include_dirs': [ 97 'include_dirs': [
98 '$(WindowsSDK_IncludePath)', 98 '$(WindowsSDK_IncludePath)',
99 '$(VCInstallDir)atlmfc/include', 99 '$(VCInstallDir)atlmfc/include',
100 '$(WINDDKDIR)/inc/atl71', 100 '$(WINDDKDIR)/inc/atl71',
101 ], 101 ],
102 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL 102 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL
103 # That Is Brought into a Process" on the link here: 103 # That Is Brought into a Process" on the link here:
104 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests 104 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests
105 'defines': ['PRODUCT_ADBLOCKPLUS', 'ISOLATION_AWARE_ENABLED'], 105 'defines': ['PRODUCT_ADBLOCKPLUS', 'ISOLATION_AWARE_ENABLED'],
106 'libraries': [ 106 'libraries': [
107 '-latlthunk',
Oleksandr 2014/07/15 09:03:20 atlthink.lib is a file from Windows Driver Kit. We
108 '-lwinhttp', 107 '-lwinhttp',
109 '-lshell32', 108 '-lshell32',
110 '-lComctl32', 109 '-lComctl32',
111 ], 110 ],
112 'configurations': { 111 'configurations': {
113 # 'libraries' is not allowed under 'configurations' :-( 112 # 'libraries' is not allowed under 'configurations' :-(
114 'Debug': { 113 'Debug': {
115 'msvs_settings': { 114 'msvs_settings': {
116 'VCLinkerTool': { 115 'VCLinkerTool': {
117 'AdditionalDependencies': ['atlsd.lib'], 116 'AdditionalDependencies': ['atlsd.lib'],
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], 163 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
165 }, 164 },
166 'msvs_settings': { 165 'msvs_settings': {
167 'VCLinkerTool': { 166 'VCLinkerTool': {
168 'SubSystem': '1', # Console 167 'SubSystem': '1', # Console
169 'EntryPointSymbol': 'mainCRTStartup', 168 'EntryPointSymbol': 'mainCRTStartup',
170 }, 169 },
171 }, 170 },
172 }] 171 }]
173 } 172 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld