Delta Between Two Patch Sets: AdblockPlusEngine.vcxproj
Issue 10894013:
Pass developmentBuild info to libadblockplus (Closed)
Left Patch Set:
Created June 5, 2013, 9:40 a.m.
Right Patch Set:
Created June 5, 2013, 10:10 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« AdblockPlus.sln ('k')
|
src/engine/main.cpp » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 163 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production| Win32'"> | 163 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production| Win32'"> |
| 164 <LinkIncremental>false</LinkIncremental> | 164 <LinkIncremental>false</LinkIncremental> |
| 165 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath> | 165 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath> |
| 166 <LibraryPath>$(ProjectDir)libadblockplus\build\x64\build\Release\lib;$(Libra ryPath)</LibraryPath> | 166 <LibraryPath>$(ProjectDir)libadblockplus\build\x64\build\Release\lib;$(Libra ryPath)</LibraryPath> |
| 167 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> | 167 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> |
| 168 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> | 168 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> |
| 169 </PropertyGroup> | 169 </PropertyGroup> |
| 170 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production| x64'"> | 170 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production| x64'"> |
| 171 <LinkIncremental>false</LinkIncremental> | 171 <LinkIncremental>false</LinkIncremental> |
| 172 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath> | 172 <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus \third_party\v8\include;$(IncludePath)</IncludePath> |
| 173 <LibraryPath>$(ProjectDir)libadblockplus\build\ia32\build\Release\lib;$(Libr aryPath)</LibraryPath> | 173 <LibraryPath>$(ProjectDir)libadblockplus\build\ia32\build\Release\lib;$(Libr aryPath)</LibraryPath> |
|
Wladimir Palant
2013/06/05 09:54:05
Please define ADBLOCK_PLUS_PRODUCTION_MODE here (a
Felix Dahlke
2013/06/05 10:12:36
Where exactly? In this PropertyGroup?
Wladimir Palant
2013/06/05 10:29:08
My bad, wrong section - you fixed Release Producti
| |
| 174 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> | 174 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> |
| 175 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> | 175 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> |
| 176 </PropertyGroup> | 176 </PropertyGroup> |
| 177 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Product ion|Win32'"> | 177 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Product ion|Win32'"> |
| 178 <ClCompile> | 178 <ClCompile> |
| 179 <PrecompiledHeader>Create</PrecompiledHeader> | 179 <PrecompiledHeader>Create</PrecompiledHeader> |
| 180 <WarningLevel>Level3</WarningLevel> | 180 <WarningLevel>Level3</WarningLevel> |
| 181 <Optimization>Disabled</Optimization> | 181 <Optimization>Disabled</Optimization> |
| 182 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)< /PreprocessorDefinitions> | 182 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MOD E;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
|
Wladimir Palant
2013/06/05 09:54:05
Please define ADBLOCK_PLUS_PRODUCTION_MODE here.
Felix Dahlke
2013/06/05 10:12:36
Done.
| |
| 183 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | 183 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| 184 </ClCompile> | 184 </ClCompile> |
| 185 <Link> | 185 <Link> |
| 186 <SubSystem>Windows</SubSystem> | 186 <SubSystem>Windows</SubSystem> |
| 187 <GenerateDebugInformation>true</GenerateDebugInformation> | 187 <GenerateDebugInformation>true</GenerateDebugInformation> |
| 188 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</ AdditionalDependencies> | 188 <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> | 189 <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe </OutputFile> |
| 190 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> | 190 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> |
| 191 </Link> | 191 </Link> |
| 192 </ItemDefinitionGroup> | 192 </ItemDefinitionGroup> |
| 193 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Wi n32'"> | 193 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Wi n32'"> |
| 194 <ClCompile> | 194 <ClCompile> |
| 195 <PrecompiledHeader>Create</PrecompiledHeader> | 195 <PrecompiledHeader>Create</PrecompiledHeader> |
| 196 <WarningLevel>Level3</WarningLevel> | 196 <WarningLevel>Level3</WarningLevel> |
| 197 <Optimization>Disabled</Optimization> | 197 <Optimization>Disabled</Optimization> |
| 198 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)< /PreprocessorDefinitions> | 198 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(Pr eprocessorDefinitions)</PreprocessorDefinitions> |
|
Wladimir Palant
2013/06/05 09:54:05
Please define ADBLOCK_PLUS_TEST_MODE here.
Felix Dahlke
2013/06/05 10:12:36
Done.
| |
| 199 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | 199 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| 200 </ClCompile> | 200 </ClCompile> |
| 201 <Link> | 201 <Link> |
| 202 <SubSystem>Windows</SubSystem> | 202 <SubSystem>Windows</SubSystem> |
| 203 <GenerateDebugInformation>true</GenerateDebugInformation> | 203 <GenerateDebugInformation>true</GenerateDebugInformation> |
| 204 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</ AdditionalDependencies> | 204 <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> | 205 <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe </OutputFile> |
| 206 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> | 206 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> |
| 207 </Link> | 207 </Link> |
| 208 </ItemDefinitionGroup> | 208 </ItemDefinitionGroup> |
| 209 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test| Win32'"> | 209 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test| Win32'"> |
| 210 <ClCompile> | 210 <ClCompile> |
| 211 <PrecompiledHeader>Create</PrecompiledHeader> | 211 <PrecompiledHeader>Create</PrecompiledHeader> |
| 212 <WarningLevel>Level3</WarningLevel> | 212 <WarningLevel>Level3</WarningLevel> |
| 213 <Optimization>Disabled</Optimization> | 213 <Optimization>Disabled</Optimization> |
| 214 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)< /PreprocessorDefinitions> | 214 <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(Pr eprocessorDefinitions)</PreprocessorDefinitions> |
|
Wladimir Palant
2013/06/05 09:54:05
Please define ADBLOCK_PLUS_TEST_MODE here.
Felix Dahlke
2013/06/05 10:12:36
Done.
| |
| 215 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | 215 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| 216 </ClCompile> | 216 </ClCompile> |
| 217 <Link> | 217 <Link> |
| 218 <SubSystem>Windows</SubSystem> | 218 <SubSystem>Windows</SubSystem> |
| 219 <GenerateDebugInformation>true</GenerateDebugInformation> | 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;%(AdditionalDependencies)</ AdditionalDependencies> | 220 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</ AdditionalDependencies> |
| 221 <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe </OutputFile> | 221 <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe </OutputFile> |
| 222 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> | 222 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> |
| 223 </Link> | 223 </Link> |
| 224 </ItemDefinitionGroup> | 224 </ItemDefinitionGroup> |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 270 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> | 270 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> |
| 271 </Link> | 271 </Link> |
| 272 </ItemDefinitionGroup> | 272 </ItemDefinitionGroup> |
| 273 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Produ ction|Win32'"> | 273 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Produ ction|Win32'"> |
| 274 <ClCompile> | 274 <ClCompile> |
| 275 <WarningLevel>Level3</WarningLevel> | 275 <WarningLevel>Level3</WarningLevel> |
| 276 <PrecompiledHeader>Create</PrecompiledHeader> | 276 <PrecompiledHeader>Create</PrecompiledHeader> |
| 277 <Optimization>MaxSpeed</Optimization> | 277 <Optimization>MaxSpeed</Optimization> |
| 278 <FunctionLevelLinking>true</FunctionLevelLinking> | 278 <FunctionLevelLinking>true</FunctionLevelLinking> |
| 279 <IntrinsicFunctions>true</IntrinsicFunctions> | 279 <IntrinsicFunctions>true</IntrinsicFunctions> |
| 280 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)< /PreprocessorDefinitions> | 280 <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MOD E;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 281 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | 281 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
| 282 </ClCompile> | 282 </ClCompile> |
| 283 <Link> | 283 <Link> |
| 284 <SubSystem>Windows</SubSystem> | 284 <SubSystem>Windows</SubSystem> |
| 285 <GenerateDebugInformation>true</GenerateDebugInformation> | 285 <GenerateDebugInformation>true</GenerateDebugInformation> |
| 286 <EnableCOMDATFolding>true</EnableCOMDATFolding> | 286 <EnableCOMDATFolding>true</EnableCOMDATFolding> |
| 287 <OptimizeReferences>true</OptimizeReferences> | 287 <OptimizeReferences>true</OptimizeReferences> |
| 288 <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base. lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</ AdditionalDependencies> | 288 <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> | 289 <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe </OutputFile> |
| 290 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> | 290 <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 325 </ItemGroup> | 325 </ItemGroup> |
| 326 <ItemGroup> | 326 <ItemGroup> |
| 327 <ClInclude Include="src\engine\stdafx.h" /> | 327 <ClInclude Include="src\engine\stdafx.h" /> |
| 328 <ClInclude Include="src\shared\Communication.h" /> | 328 <ClInclude Include="src\shared\Communication.h" /> |
| 329 <ClInclude Include="src\shared\AutoHandle.h" /> | 329 <ClInclude Include="src\shared\AutoHandle.h" /> |
| 330 </ItemGroup> | 330 </ItemGroup> |
| 331 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 331 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 332 <ImportGroup Label="ExtensionTargets"> | 332 <ImportGroup Label="ExtensionTargets"> |
| 333 </ImportGroup> | 333 </ImportGroup> |
| 334 </Project> | 334 </Project> |
| LEFT | RIGHT |
« AdblockPlus.sln ('k')
|
src/engine/main.cpp » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
