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

Side by Side Diff: adblockplus.gyp

Issue 11756012: Enhanced Protected Mode support (Closed)
Patch Set: Created Sept. 15, 2013, 1 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 | src/engine/Main.cpp » ('j') | src/engine/Main.cpp » ('J')
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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 'AdditionalDependencies': ['atls.lib'], 121 'AdditionalDependencies': ['atls.lib'],
122 }, 122 },
123 }, 123 },
124 }, 124 },
125 }, 125 },
126 'msvs_settings': { 126 'msvs_settings': {
127 'VCLinkerTool': { 127 'VCLinkerTool': {
128 'conditions': [[ 128 'conditions': [[
129 'target_arch=="ia32"', { 129 'target_arch=="ia32"', {
130 'AdditionalLibraryDirectories': [ 130 'AdditionalLibraryDirectories': [
131 '$(VCInstallDir)atlmfc/lib',
131 '$(WindowsSDK_LibraryPath_x86)', 132 '$(WindowsSDK_LibraryPath_x86)',
132 '$(WINDDKDIR)/lib/ATL/i386', 133 '$(WINDDKDIR)/lib/ATL/i386',
133 ], 134 ],
134 }, { 135 }, {
135 'AdditionalLibraryDirectories': [ 136 'AdditionalLibraryDirectories': [
137 '$(VCInstallDir)atlmfc/lib/amd64',
138 '$(WINDDKDIR)/lib/ATL/amd64',
Wladimir Palant 2013/09/16 13:45:07 Nit: probably makes sense to have the order of ent
136 '$(WindowsSDK_LibraryPath_x64)', 139 '$(WindowsSDK_LibraryPath_x64)',
137 '$(WINDDKDIR)/lib/ATL/amd64',
138 ], 140 ],
139 } 141 }
140 ]], 142 ]],
141 'AdditionalLibraryDirectories': [
142 '$(VCInstallDir)atlmfc/lib',
143 ],
144 'DelayLoadDLLs': ['Shell32.dll'], 143 'DelayLoadDLLs': ['Shell32.dll'],
145 }, 144 },
146 }, 145 },
147 }, 146 },
148 147
149 { 148 {
150 'target_name': 'tests', 149 'target_name': 'tests',
151 'type': 'executable', 150 'type': 'executable',
152 'dependencies': [ 151 'dependencies': [
153 'libadblockplus/third_party/googletest.gyp:googletest_main', 152 'libadblockplus/third_party/googletest.gyp:googletest_main',
154 ], 153 ],
155 'sources': [ 154 'sources': [
156 'test/CommunicationTest.cpp', 155 'test/CommunicationTest.cpp',
157 'test/DictionaryTest.cpp', 156 'test/DictionaryTest.cpp',
158 '<@(shared_files)', 157 '<@(shared_files)',
159 ], 158 ],
160 'defines': ['WINVER=0x0501'], 159 'defines': ['WINVER=0x0501'],
161 'link_settings': { 160 'link_settings': {
162 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], 161 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
163 }, 162 },
164 'msvs_settings': { 163 'msvs_settings': {
165 'VCLinkerTool': { 164 'VCLinkerTool': {
166 'SubSystem': '1', # Console 165 'SubSystem': '1', # Console
167 'EntryPointSymbol': 'mainCRTStartup', 166 'EntryPointSymbol': 'mainCRTStartup',
168 }, 167 },
169 }, 168 },
170 }] 169 }]
171 } 170 }
OLDNEW
« no previous file with comments | « no previous file | src/engine/Main.cpp » ('j') | src/engine/Main.cpp » ('J')

Powered by Google App Engine
This is Rietveld