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

Delta Between Two Patch Sets: AdblockPlusEngine.vcxproj

Issue 10920006: Expect MSI installers (Closed)
Left Patch Set: Created June 10, 2013, 3:27 p.m.
Right Patch Set: Separate function to run updater, using msiexec now Created June 13, 2013, 2:32 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | src/engine/Updater.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microso ft.com/developer/msbuild/2003"> 2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microso ft.com/developer/msbuild/2003">
3 <ItemGroup Label="ProjectConfigurations"> 3 <ItemGroup Label="ProjectConfigurations">
4 <ProjectConfiguration Include="Debug Production|Win32"> 4 <ProjectConfiguration Include="Debug Production|Win32">
5 <Configuration>Debug Production</Configuration> 5 <Configuration>Debug Production</Configuration>
6 <Platform>Win32</Platform> 6 <Platform>Win32</Platform>
7 </ProjectConfiguration> 7 </ProjectConfiguration>
8 <ProjectConfiguration Include="Debug Production|x64"> 8 <ProjectConfiguration Include="Debug Production|x64">
9 <Configuration>Debug Production</Configuration> 9 <Configuration>Debug Production</Configuration>
10 <Platform>x64</Platform> 10 <Platform>x64</Platform>
(...skipping 25 matching lines...) Expand all
36 </ItemGroup> 36 </ItemGroup>
37 <PropertyGroup Label="Globals"> 37 <PropertyGroup Label="Globals">
38 <ProjectGuid>{9175DCD4-8960-4712-8FBC-B58E51EDEC9E}</ProjectGuid> 38 <ProjectGuid>{9175DCD4-8960-4712-8FBC-B58E51EDEC9E}</ProjectGuid>
39 <Keyword>Win32Proj</Keyword> 39 <Keyword>Win32Proj</Keyword>
40 <RootNamespace>AdblockPlusEngine</RootNamespace> 40 <RootNamespace>AdblockPlusEngine</RootNamespace>
41 </PropertyGroup> 41 </PropertyGroup>
42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
43 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|Wi n32'" Label="Configuration"> 43 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|Wi n32'" Label="Configuration">
44 <ConfigurationType>Application</ConfigurationType> 44 <ConfigurationType>Application</ConfigurationType>
45 <UseDebugLibraries>true</UseDebugLibraries> 45 <UseDebugLibraries>true</UseDebugLibraries>
46 <PlatformToolset>v110</PlatformToolset> 46 <PlatformToolset>v110_xp</PlatformToolset>
47 <CharacterSet>Unicode</CharacterSet> 47 <CharacterSet>Unicode</CharacterSet>
48 </PropertyGroup> 48 </PropertyGroup>
49 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Win32'" Label="Configuration"> 49 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Win32'" Label="Configuration">
50 <ConfigurationType>Application</ConfigurationType> 50 <ConfigurationType>Application</ConfigurationType>
51 <UseDebugLibraries>true</UseDebugLibraries> 51 <UseDebugLibraries>true</UseDebugLibraries>
52 <PlatformToolset>v110</PlatformToolset> 52 <PlatformToolset>v110_xp</PlatformToolset>
53 <CharacterSet>Unicode</CharacterSet> 53 <CharacterSet>Unicode</CharacterSet>
54 </PropertyGroup> 54 </PropertyGroup>
55 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32' " Label="Configuration"> 55 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32' " Label="Configuration">
56 <ConfigurationType>Application</ConfigurationType> 56 <ConfigurationType>Application</ConfigurationType>
57 <UseDebugLibraries>false</UseDebugLibraries>
58 <PlatformToolset>v110_xp</PlatformToolset>
59 <WholeProgramOptimization>true</WholeProgramOptimization>
60 <CharacterSet>Unicode</CharacterSet>
61 </PropertyGroup>
62 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|x6 4'" Label="Configuration">
63 <ConfigurationType>Application</ConfigurationType>
57 <UseDebugLibraries>true</UseDebugLibraries> 64 <UseDebugLibraries>true</UseDebugLibraries>
58 <PlatformToolset>v110</PlatformToolset> 65 <PlatformToolset>v110_xp</PlatformToolset>
59 <CharacterSet>Unicode</CharacterSet> 66 <CharacterSet>Unicode</CharacterSet>
60 </PropertyGroup> 67 </PropertyGroup>
61 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|x6 4'" Label="Configuration"> 68 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|x64'" La bel="Configuration">
62 <ConfigurationType>Application</ConfigurationType> 69 <ConfigurationType>Application</ConfigurationType>
63 <UseDebugLibraries>true</UseDebugLibraries> 70 <UseDebugLibraries>true</UseDebugLibraries>
64 <PlatformToolset>v110</PlatformToolset> 71 <PlatformToolset>v110_xp</PlatformToolset>
65 <CharacterSet>Unicode</CharacterSet>
66 </PropertyGroup>
67 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|x64'" La bel="Configuration">
68 <ConfigurationType>Application</ConfigurationType>
69 <UseDebugLibraries>true</UseDebugLibraries>
70 <PlatformToolset>v110</PlatformToolset>
71 <CharacterSet>Unicode</CharacterSet> 72 <CharacterSet>Unicode</CharacterSet>
72 </PropertyGroup> 73 </PropertyGroup>
73 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'" Label="Configuration"> 74 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'" Label="Configuration">
74 <ConfigurationType>Application</ConfigurationType> 75 <ConfigurationType>Application</ConfigurationType>
75 <UseDebugLibraries>true</UseDebugLibraries> 76 <UseDebugLibraries>false</UseDebugLibraries>
76 <PlatformToolset>v110</PlatformToolset> 77 <PlatformToolset>v110_xp</PlatformToolset>
78 <WholeProgramOptimization>true</WholeProgramOptimization>
77 <CharacterSet>Unicode</CharacterSet> 79 <CharacterSet>Unicode</CharacterSet>
78 </PropertyGroup> 80 </PropertyGroup>
79 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production| Win32'" Label="Configuration"> 81 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production| Win32'" Label="Configuration">
80 <ConfigurationType>Application</ConfigurationType> 82 <ConfigurationType>Application</ConfigurationType>
81 <UseDebugLibraries>false</UseDebugLibraries> 83 <UseDebugLibraries>false</UseDebugLibraries>
82 <PlatformToolset>v110</PlatformToolset> 84 <PlatformToolset>v110_xp</PlatformToolset>
83 <WholeProgramOptimization>true</WholeProgramOptimization> 85 <WholeProgramOptimization>true</WholeProgramOptimization>
84 <CharacterSet>Unicode</CharacterSet> 86 <CharacterSet>Unicode</CharacterSet>
85 </PropertyGroup> 87 </PropertyGroup>
86 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production| x64'" Label="Configuration"> 88 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production| x64'" Label="Configuration">
87 <ConfigurationType>Application</ConfigurationType> 89 <ConfigurationType>Application</ConfigurationType>
88 <UseDebugLibraries>false</UseDebugLibraries> 90 <UseDebugLibraries>false</UseDebugLibraries>
89 <PlatformToolset>v110</PlatformToolset> 91 <PlatformToolset>v110_xp</PlatformToolset>
90 <WholeProgramOptimization>true</WholeProgramOptimization> 92 <WholeProgramOptimization>true</WholeProgramOptimization>
91 <CharacterSet>Unicode</CharacterSet> 93 <CharacterSet>Unicode</CharacterSet>
92 </PropertyGroup> 94 </PropertyGroup>
93 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 95 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
94 <ImportGroup Label="ExtensionSettings"> 96 <ImportGroup Label="ExtensionSettings">
95 </ImportGroup> 97 </ImportGroup>
96 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'= ='Debug Production|Win32'"> 98 <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'= ='Debug Production|Win32'">
97 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condit ion="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="Local AppDataPlatform" /> 99 <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condit ion="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="Local AppDataPlatform" />
98 </ImportGroup> 100 </ImportGroup>
99 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Win32'" La bel="PropertySheets"> 101 <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Win32'" La bel="PropertySheets">
(...skipping 26 matching lines...) Expand all
126 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> 128 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir>
127 </PropertyGroup> 129 </PropertyGroup>
128 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Win32'"> 130 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Win32'">
129 <LinkIncremental>true</LinkIncremental> 131 <LinkIncremental>true</LinkIncremental>
130 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath> 132 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath>
131 <LibraryPath>$(ProjectDir)libadblockplus\build\ia32\build\Debug\lib;$(Librar yPath)</LibraryPath> 133 <LibraryPath>$(ProjectDir)libadblockplus\build\ia32\build\Debug\lib;$(Librar yPath)</LibraryPath>
132 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> 134 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir>
133 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> 135 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir>
134 </PropertyGroup> 136 </PropertyGroup>
135 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32' "> 137 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32' ">
136 <LinkIncremental>true</LinkIncremental> 138 <LinkIncremental>false</LinkIncremental>
137 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath> 139 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath>
138 <LibraryPath>$(ProjectDir)libadblockplus\build\ia32\build\Debug\lib;$(Librar yPath)</LibraryPath> 140 <LibraryPath>$(ProjectDir)libadblockplus\build\ia32\build\Release\lib;$(Libr aryPath)</LibraryPath>
139 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> 141 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir>
140 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> 142 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir>
141 </PropertyGroup> 143 </PropertyGroup>
142 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|x6 4'"> 144 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|x6 4'">
143 <LinkIncremental>true</LinkIncremental> 145 <LinkIncremental>true</LinkIncremental>
144 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath> 146 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath>
145 <LibraryPath>$(ProjectDir)libadblockplus\build\x64\build\Debug\lib;$(Library Path)</LibraryPath> 147 <LibraryPath>$(ProjectDir)libadblockplus\build\x64\build\Debug\lib;$(Library Path)</LibraryPath>
146 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> 148 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>
147 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> 149 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir>
148 </PropertyGroup> 150 </PropertyGroup>
149 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|x64'"> 151 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|x64'">
150 <LinkIncremental>true</LinkIncremental> 152 <LinkIncremental>true</LinkIncremental>
151 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath> 153 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath>
152 <LibraryPath>$(ProjectDir)libadblockplus\build\x64\build\Debug\lib;$(Library Path)</LibraryPath> 154 <LibraryPath>$(ProjectDir)libadblockplus\build\x64\build\Debug\lib;$(Library Path)</LibraryPath>
153 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> 155 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>
154 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> 156 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir>
155 </PropertyGroup> 157 </PropertyGroup>
156 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'"> 158 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'">
157 <LinkIncremental>true</LinkIncremental> 159 <LinkIncremental>false</LinkIncremental>
158 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath> 160 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath>
159 <LibraryPath>$(ProjectDir)libadblockplus\build\x64\build\Debug\lib;$(Library Path)</LibraryPath> 161 <LibraryPath>$(ProjectDir)libadblockplus\build\x64\build\Release\lib;$(Libra ryPath)</LibraryPath>
160 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> 162 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>
161 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> 163 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir>
162 </PropertyGroup> 164 </PropertyGroup>
163 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production| Win32'"> 165 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production| Win32'">
164 <LinkIncremental>false</LinkIncremental> 166 <LinkIncremental>false</LinkIncremental>
165 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath> 167 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath>
166 <LibraryPath>$(ProjectDir)libadblockplus\build\ia32\build\Release\lib;$(Libr aryPath)</LibraryPath> 168 <LibraryPath>$(ProjectDir)libadblockplus\build\ia32\build\Release\lib;$(Libr aryPath)</LibraryPath>
167 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> 169 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir>
168 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> 170 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir>
169 </PropertyGroup> 171 </PropertyGroup>
170 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production| x64'"> 172 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production| x64'">
171 <LinkIncremental>false</LinkIncremental> 173 <LinkIncremental>false</LinkIncremental>
172 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath> 174 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath>
173 <LibraryPath>$(ProjectDir)libadblockplus\build\x64\build\Release\lib;$(Libra ryPath)</LibraryPath> 175 <LibraryPath>$(ProjectDir)libadblockplus\build\x64\build\Release\lib;$(Libra ryPath)</LibraryPath>
174 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> 176 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>
175 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> 177 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir>
176 </PropertyGroup> 178 </PropertyGroup>
177 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Product ion|Win32'"> 179 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Product ion|Win32'">
178 <ClCompile> 180 <ClCompile>
179 <PrecompiledHeader>NotUsing</PrecompiledHeader> 181 <PrecompiledHeader>NotUsing</PrecompiledHeader>
180 <WarningLevel>Level3</WarningLevel> 182 <WarningLevel>Level3</WarningLevel>
181 <Optimization>Disabled</Optimization> 183 <Optimization>Disabled</Optimization>
182 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MOD E;%(PreprocessorDefinitions)</PreprocessorDefinitions> 184 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MOD E;$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDef initions>
183 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 185 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
184 </ClCompile> 186 </ClCompile>
185 <Link> 187 <ResourceCompile>
186 <SubSystem>Windows</SubSystem> 188 <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(Preprocessor Definitions)</PreprocessorDefinitions>
187 <GenerateDebugInformation>true</GenerateDebugInformation> 189 </ResourceCompile>
188 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDepende ncies)</AdditionalDependencies> 190 <Link>
Oleksandr 2013/06/10 16:47:56 Is there any reason why msi is included both stati
Wladimir Palant 2013/06/11 04:29:56 We need msi.lib to compile. We delay-load msi.dll
Felix Dahlke 2013/06/11 10:07:52 I don't get this. If it's statically linked, it's
Oleksandr 2013/06/11 10:24:49 Does it not compile if you remove msi.lib? On 201
Wladimir Palant 2013/06/11 14:42:10 It isn't statically link - you cannot link a syste
191 <SubSystem>Windows</SubSystem>
192 <GenerateDebugInformation>true</GenerateDebugInformation>
193 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</ AdditionalDependencies>
189 <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe </OutputFile> 194 <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe </OutputFile>
190 <DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> 195 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs>
191 </Link> 196 </Link>
192 </ItemDefinitionGroup> 197 </ItemDefinitionGroup>
193 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Wi n32'"> 198 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Wi n32'">
194 <ClCompile> 199 <ClCompile>
195 <PrecompiledHeader>NotUsing</PrecompiledHeader> 200 <PrecompiledHeader>NotUsing</PrecompiledHeader>
196 <WarningLevel>Level3</WarningLevel> 201 <WarningLevel>Level3</WarningLevel>
197 <Optimization>Disabled</Optimization> 202 <Optimization>Disabled</Optimization>
198 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(Pr eprocessorDefinitions)</PreprocessorDefinitions> 203 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;$(Ex ternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitio ns>
199 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 204 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
200 </ClCompile> 205 </ClCompile>
201 <Link> 206 <ResourceCompile>
202 <SubSystem>Windows</SubSystem> 207 <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(Preprocessor Definitions)</PreprocessorDefinitions>
203 <GenerateDebugInformation>true</GenerateDebugInformation> 208 </ResourceCompile>
204 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDepende ncies)</AdditionalDependencies> 209 <Link>
210 <SubSystem>Windows</SubSystem>
211 <GenerateDebugInformation>true</GenerateDebugInformation>
212 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</ AdditionalDependencies>
205 <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe </OutputFile> 213 <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe </OutputFile>
206 <DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> 214 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs>
207 </Link> 215 </Link>
208 </ItemDefinitionGroup> 216 </ItemDefinitionGroup>
209 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test| Win32'"> 217 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test| Win32'">
210 <ClCompile>
211 <PrecompiledHeader>NotUsing</PrecompiledHeader>
212 <WarningLevel>Level3</WarningLevel>
213 <Optimization>Disabled</Optimization>
214 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(Pr eprocessorDefinitions)</PreprocessorDefinitions>
215 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
216 </ClCompile>
217 <Link>
218 <SubSystem>Windows</SubSystem>
219 <GenerateDebugInformation>true</GenerateDebugInformation>
220 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDepende ncies)</AdditionalDependencies>
221 <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe </OutputFile>
222 <DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs>
223 </Link>
224 </ItemDefinitionGroup>
225 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Product ion|x64'">
226 <ClCompile>
227 <PrecompiledHeader>NotUsing</PrecompiledHeader>
228 <WarningLevel>Level3</WarningLevel>
229 <Optimization>Disabled</Optimization>
230 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MOD E;%(PreprocessorDefinitions)</PreprocessorDefinitions>
231 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
232 </ClCompile>
233 <Link>
234 <SubSystem>Windows</SubSystem>
235 <GenerateDebugInformation>true</GenerateDebugInformation>
236 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDepende ncies)</AdditionalDependencies>
237 <OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe< /OutputFile>
238 <DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs>
239 </Link>
240 </ItemDefinitionGroup>
241 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|x6 4'">
242 <ClCompile>
243 <PrecompiledHeader>NotUsing</PrecompiledHeader>
244 <WarningLevel>Level3</WarningLevel>
245 <Optimization>Disabled</Optimization>
246 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(Pr eprocessorDefinitions)</PreprocessorDefinitions>
247 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
248 </ClCompile>
249 <Link>
250 <SubSystem>Windows</SubSystem>
251 <GenerateDebugInformation>true</GenerateDebugInformation>
252 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDepende ncies)</AdditionalDependencies>
253 <OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe< /OutputFile>
254 <DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs>
255 </Link>
256 </ItemDefinitionGroup>
257 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test| x64'">
258 <ClCompile>
259 <PrecompiledHeader>NotUsing</PrecompiledHeader>
260 <WarningLevel>Level3</WarningLevel>
261 <Optimization>Disabled</Optimization>
262 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(Pr eprocessorDefinitions)</PreprocessorDefinitions>
263 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
264 </ClCompile>
265 <Link>
266 <SubSystem>Windows</SubSystem>
267 <GenerateDebugInformation>true</GenerateDebugInformation>
268 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDepende ncies)</AdditionalDependencies>
269 <OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe< /OutputFile>
270 <DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs>
271 </Link>
272 </ItemDefinitionGroup>
273 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Produ ction|Win32'">
274 <ClCompile> 218 <ClCompile>
275 <WarningLevel>Level3</WarningLevel> 219 <WarningLevel>Level3</WarningLevel>
276 <PrecompiledHeader>NotUsing</PrecompiledHeader> 220 <PrecompiledHeader>NotUsing</PrecompiledHeader>
277 <Optimization>MaxSpeed</Optimization> 221 <Optimization>MaxSpeed</Optimization>
278 <FunctionLevelLinking>true</FunctionLevelLinking> 222 <FunctionLevelLinking>true</FunctionLevelLinking>
279 <IntrinsicFunctions>true</IntrinsicFunctions> 223 <IntrinsicFunctions>true</IntrinsicFunctions>
280 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MOD E;%(PreprocessorDefinitions)</PreprocessorDefinitions> 224 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;$(Ex ternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitio ns>
281 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 225 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
282 </ClCompile> 226 </ClCompile>
227 <ResourceCompile>
228 <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(Preprocessor Definitions)</PreprocessorDefinitions>
229 </ResourceCompile>
283 <Link> 230 <Link>
284 <SubSystem>Windows</SubSystem> 231 <SubSystem>Windows</SubSystem>
285 <GenerateDebugInformation>true</GenerateDebugInformation> 232 <GenerateDebugInformation>true</GenerateDebugInformation>
286 <EnableCOMDATFolding>true</EnableCOMDATFolding> 233 <EnableCOMDATFolding>true</EnableCOMDATFolding>
287 <OptimizeReferences>true</OptimizeReferences> 234 <OptimizeReferences>true</OptimizeReferences>
288 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDepende ncies)</AdditionalDependencies> 235 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</ AdditionalDependencies>
289 <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe </OutputFile> 236 <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe </OutputFile>
290 <DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> 237 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs>
291 </Link> 238 </Link>
292 </ItemDefinitionGroup> 239 </ItemDefinitionGroup>
293 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Produ ction|x64'"> 240 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Product ion|x64'">
241 <ClCompile>
242 <PrecompiledHeader>NotUsing</PrecompiledHeader>
243 <WarningLevel>Level3</WarningLevel>
244 <Optimization>Disabled</Optimization>
245 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MOD E;$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDef initions>
246 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
247 </ClCompile>
248 <ResourceCompile>
249 <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(Preprocessor Definitions)</PreprocessorDefinitions>
250 </ResourceCompile>
251 <Link>
252 <SubSystem>Windows</SubSystem>
253 <GenerateDebugInformation>true</GenerateDebugInformation>
254 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</ AdditionalDependencies>
255 <OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe< /OutputFile>
256 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs>
257 </Link>
258 </ItemDefinitionGroup>
259 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|x6 4'">
260 <ClCompile>
261 <PrecompiledHeader>NotUsing</PrecompiledHeader>
262 <WarningLevel>Level3</WarningLevel>
263 <Optimization>Disabled</Optimization>
264 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;$(Ex ternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitio ns>
265 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
266 </ClCompile>
267 <ResourceCompile>
268 <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(Preprocessor Definitions)</PreprocessorDefinitions>
269 </ResourceCompile>
270 <Link>
271 <SubSystem>Windows</SubSystem>
272 <GenerateDebugInformation>true</GenerateDebugInformation>
273 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</ AdditionalDependencies>
274 <OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe< /OutputFile>
275 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs>
276 </Link>
277 </ItemDefinitionGroup>
278 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test| x64'">
294 <ClCompile> 279 <ClCompile>
295 <WarningLevel>Level3</WarningLevel> 280 <WarningLevel>Level3</WarningLevel>
296 <PrecompiledHeader>NotUsing</PrecompiledHeader> 281 <PrecompiledHeader>NotUsing</PrecompiledHeader>
297 <Optimization>MaxSpeed</Optimization> 282 <Optimization>MaxSpeed</Optimization>
298 <FunctionLevelLinking>true</FunctionLevelLinking> 283 <FunctionLevelLinking>true</FunctionLevelLinking>
299 <IntrinsicFunctions>true</IntrinsicFunctions> 284 <IntrinsicFunctions>true</IntrinsicFunctions>
300 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MOD E;%(PreprocessorDefinitions)</PreprocessorDefinitions> 285 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;$(Ex ternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitio ns>
301 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 286 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
302 </ClCompile> 287 </ClCompile>
288 <ResourceCompile>
289 <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(Preprocessor Definitions)</PreprocessorDefinitions>
290 </ResourceCompile>
303 <Link> 291 <Link>
304 <SubSystem>Windows</SubSystem> 292 <SubSystem>Windows</SubSystem>
305 <GenerateDebugInformation>true</GenerateDebugInformation> 293 <GenerateDebugInformation>true</GenerateDebugInformation>
306 <EnableCOMDATFolding>true</EnableCOMDATFolding> 294 <EnableCOMDATFolding>true</EnableCOMDATFolding>
307 <OptimizeReferences>true</OptimizeReferences> 295 <OptimizeReferences>true</OptimizeReferences>
308 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;msi.lib;%(AdditionalDepende ncies)</AdditionalDependencies> 296 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</ AdditionalDependencies>
309 <OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe< /OutputFile> 297 <OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe< /OutputFile>
310 <DelayLoadDLLs>Shell32.dll;Msi.dll</DelayLoadDLLs> 298 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs>
299 </Link>
300 </ItemDefinitionGroup>
301 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Produ ction|Win32'">
302 <ClCompile>
303 <WarningLevel>Level3</WarningLevel>
304 <PrecompiledHeader>NotUsing</PrecompiledHeader>
305 <Optimization>MaxSpeed</Optimization>
306 <FunctionLevelLinking>true</FunctionLevelLinking>
307 <IntrinsicFunctions>true</IntrinsicFunctions>
308 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MOD E;$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDef initions>
309 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
310 </ClCompile>
311 <ResourceCompile>
312 <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(Preprocessor Definitions)</PreprocessorDefinitions>
313 </ResourceCompile>
314 <Link>
315 <SubSystem>Windows</SubSystem>
316 <GenerateDebugInformation>true</GenerateDebugInformation>
317 <EnableCOMDATFolding>true</EnableCOMDATFolding>
318 <OptimizeReferences>true</OptimizeReferences>
319 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</ AdditionalDependencies>
320 <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe </OutputFile>
321 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs>
322 </Link>
323 </ItemDefinitionGroup>
324 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Produ ction|x64'">
325 <ClCompile>
326 <WarningLevel>Level3</WarningLevel>
327 <PrecompiledHeader>NotUsing</PrecompiledHeader>
328 <Optimization>MaxSpeed</Optimization>
329 <FunctionLevelLinking>true</FunctionLevelLinking>
330 <IntrinsicFunctions>true</IntrinsicFunctions>
331 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MOD E;$(ExternalPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDef initions>
332 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
333 </ClCompile>
334 <ResourceCompile>
335 <PreprocessorDefinitions>$(ExternalPreprocessorDefinitions);%(Preprocessor Definitions)</PreprocessorDefinitions>
336 </ResourceCompile>
337 <Link>
338 <SubSystem>Windows</SubSystem>
339 <GenerateDebugInformation>true</GenerateDebugInformation>
340 <EnableCOMDATFolding>true</EnableCOMDATFolding>
341 <OptimizeReferences>true</OptimizeReferences>
342 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</ AdditionalDependencies>
343 <OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe< /OutputFile>
344 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs>
311 </Link> 345 </Link>
312 </ItemDefinitionGroup> 346 </ItemDefinitionGroup>
313 <ItemGroup> 347 <ItemGroup>
314 <ClCompile Include="src\engine\main.cpp" /> 348 <ClCompile Include="src\engine\main.cpp" />
315 <ClCompile Include="src\engine\Debug.cpp" /> 349 <ClCompile Include="src\engine\Debug.cpp" />
316 <ClCompile Include="src\engine\Updater.cpp" /> 350 <ClCompile Include="src\engine\Updater.cpp" />
317 <ClCompile Include="src\shared\Communication.cpp" /> 351 <ClCompile Include="src\shared\Communication.cpp" />
318 <ClCompile Include="src\shared\AutoHandle.cpp" /> 352 <ClCompile Include="src\shared\AutoHandle.cpp" />
319 <ClCompile Include="src\shared\Dictionary.cpp" /> 353 <ClCompile Include="src\shared\Dictionary.cpp" />
320 <ClCompile Include="src\shared\Utils.cpp" /> 354 <ClCompile Include="src\shared\Utils.cpp" />
321 </ItemGroup> 355 </ItemGroup>
322 <ItemGroup> 356 <ItemGroup>
323 <ClInclude Include="src\engine\Debug.h" /> 357 <ClInclude Include="src\engine\Debug.h" />
324 <ClInclude Include="src\engine\Resource.h" /> 358 <ClInclude Include="src\engine\Resource.h" />
325 <ClInclude Include="src\engine\Updater.h" /> 359 <ClInclude Include="src\engine\Updater.h" />
326 <ClInclude Include="src\shared\AutoHandle.h" /> 360 <ClInclude Include="src\shared\AutoHandle.h" />
327 <ClInclude Include="src\shared\Communication.h" /> 361 <ClInclude Include="src\shared\Communication.h" />
328 <ClInclude Include="src\shared\Dictionary.h" /> 362 <ClInclude Include="src\shared\Dictionary.h" />
329 <ClInclude Include="src\shared\Utils.h" /> 363 <ClInclude Include="src\shared\Utils.h" />
330 <ClInclude Include="src\shared\Version.h" /> 364 <ClInclude Include="src\shared\Version.h" />
331 </ItemGroup> 365 </ItemGroup>
332 <ItemGroup> 366 <ItemGroup>
333 <ResourceCompile Include="src\engine\engine.rc" /> 367 <ResourceCompile Include="src\engine\engine.rc" />
334 </ItemGroup> 368 </ItemGroup>
335 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 369 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
336 <ImportGroup Label="ExtensionTargets"> 370 <ImportGroup Label="ExtensionTargets">
337 </ImportGroup> 371 </ImportGroup>
338 </Project> 372 </Project>
LEFTRIGHT
« no previous file | src/engine/Updater.cpp » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld