Unified Diff: AdblockPlusEngine.vcxproj
Issue 10894013:
Pass developmentBuild info to libadblockplus (Closed)
Patch Set:
Created June 5, 2013, 9:40 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« AdblockPlus.sln ('k')
|
src/engine/main.cpp » ('j')
|
src/engine/main.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: AdblockPlusEngine.vcxproj |
| =================================================================== |
| --- a/AdblockPlusEngine.vcxproj |
| +++ b/AdblockPlusEngine.vcxproj |
| @@ -9,6 +9,14 @@ |
| <Configuration>Debug Production</Configuration> |
| <Platform>x64</Platform> |
| </ProjectConfiguration> |
| + <ProjectConfiguration Include="Debug Test|Win32"> |
| + <Configuration>Debug Test</Configuration> |
| + <Platform>Win32</Platform> |
| + </ProjectConfiguration> |
| + <ProjectConfiguration Include="Debug Test|x64"> |
| + <Configuration>Debug Test</Configuration> |
| + <Platform>x64</Platform> |
| + </ProjectConfiguration> |
| <ProjectConfiguration Include="Release Production|Win32"> |
| <Configuration>Release Production</Configuration> |
| <Platform>Win32</Platform> |
| @@ -17,6 +25,14 @@ |
| <Configuration>Release Production</Configuration> |
| <Platform>x64</Platform> |
| </ProjectConfiguration> |
| + <ProjectConfiguration Include="Release Test|Win32"> |
| + <Configuration>Release Test</Configuration> |
| + <Platform>Win32</Platform> |
| + </ProjectConfiguration> |
| + <ProjectConfiguration Include="Release Test|x64"> |
| + <Configuration>Release Test</Configuration> |
| + <Platform>x64</Platform> |
| + </ProjectConfiguration> |
| </ItemGroup> |
| <PropertyGroup Label="Globals"> |
| <ProjectGuid>{9175DCD4-8960-4712-8FBC-B58E51EDEC9E}</ProjectGuid> |
| @@ -30,12 +46,36 @@ |
| <PlatformToolset>v110</PlatformToolset> |
| <CharacterSet>Unicode</CharacterSet> |
| </PropertyGroup> |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Win32'" Label="Configuration"> |
| + <ConfigurationType>Application</ConfigurationType> |
| + <UseDebugLibraries>true</UseDebugLibraries> |
| + <PlatformToolset>v110</PlatformToolset> |
| + <CharacterSet>Unicode</CharacterSet> |
| + </PropertyGroup> |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32'" Label="Configuration"> |
| + <ConfigurationType>Application</ConfigurationType> |
| + <UseDebugLibraries>true</UseDebugLibraries> |
| + <PlatformToolset>v110</PlatformToolset> |
| + <CharacterSet>Unicode</CharacterSet> |
| + </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|x64'" Label="Configuration"> |
| <ConfigurationType>Application</ConfigurationType> |
| <UseDebugLibraries>true</UseDebugLibraries> |
| <PlatformToolset>v110</PlatformToolset> |
| <CharacterSet>Unicode</CharacterSet> |
| </PropertyGroup> |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|x64'" Label="Configuration"> |
| + <ConfigurationType>Application</ConfigurationType> |
| + <UseDebugLibraries>true</UseDebugLibraries> |
| + <PlatformToolset>v110</PlatformToolset> |
| + <CharacterSet>Unicode</CharacterSet> |
| + </PropertyGroup> |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'" Label="Configuration"> |
| + <ConfigurationType>Application</ConfigurationType> |
| + <UseDebugLibraries>true</UseDebugLibraries> |
| + <PlatformToolset>v110</PlatformToolset> |
| + <CharacterSet>Unicode</CharacterSet> |
| + </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production|Win32'" Label="Configuration"> |
| <ConfigurationType>Application</ConfigurationType> |
| <UseDebugLibraries>false</UseDebugLibraries> |
| @@ -56,9 +96,21 @@ |
| <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug Production|Win32'"> |
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
| </ImportGroup> |
| + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Win32'" Label="PropertySheets"> |
| + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
| + </ImportGroup> |
| + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32'" Label="PropertySheets"> |
| + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
| + </ImportGroup> |
| <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|x64'" Label="PropertySheets"> |
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
| </ImportGroup> |
| + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|x64'" Label="PropertySheets"> |
| + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
| + </ImportGroup> |
| + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'" Label="PropertySheets"> |
| + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
| + </ImportGroup> |
| <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release Production|Win32'"> |
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> |
| </ImportGroup> |
| @@ -73,6 +125,20 @@ |
| <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> |
| <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> |
| </PropertyGroup> |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Win32'"> |
| + <LinkIncremental>true</LinkIncremental> |
| + <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;$(IncludePath)</IncludePath> |
| + <LibraryPath>$(ProjectDir)libadblockplus\build\ia32\build\Debug\lib;$(LibraryPath)</LibraryPath> |
| + <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> |
| + <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> |
| + </PropertyGroup> |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32'"> |
| + <LinkIncremental>true</LinkIncremental> |
| + <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;$(IncludePath)</IncludePath> |
| + <LibraryPath>$(ProjectDir)libadblockplus\build\ia32\build\Debug\lib;$(LibraryPath)</LibraryPath> |
| + <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> |
| + <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> |
| + </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|x64'"> |
| <LinkIncremental>true</LinkIncremental> |
| <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;$(IncludePath)</IncludePath> |
| @@ -80,6 +146,20 @@ |
| <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> |
| <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> |
| </PropertyGroup> |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|x64'"> |
| + <LinkIncremental>true</LinkIncremental> |
| + <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;$(IncludePath)</IncludePath> |
| + <LibraryPath>$(ProjectDir)libadblockplus\build\x64\build\Debug\lib;$(LibraryPath)</LibraryPath> |
| + <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> |
| + <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> |
| + </PropertyGroup> |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'"> |
| + <LinkIncremental>true</LinkIncremental> |
| + <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;$(IncludePath)</IncludePath> |
| + <LibraryPath>$(ProjectDir)libadblockplus\build\x64\build\Debug\lib;$(LibraryPath)</LibraryPath> |
| + <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> |
| + <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> |
| + </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Production|Win32'"> |
| <LinkIncremental>false</LinkIncremental> |
| <IncludePath>$(ProjectDir)libadblockplus\include;$(ProjectDir)libadblockplus\third_party\v8\include;$(IncludePath)</IncludePath> |
| @@ -110,12 +190,76 @@ |
| <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> |
| </Link> |
| </ItemDefinitionGroup> |
| + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|Win32'"> |
| + <ClCompile> |
| + <PrecompiledHeader>Create</PrecompiledHeader> |
| + <WarningLevel>Level3</WarningLevel> |
| + <Optimization>Disabled</Optimization> |
| + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</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.
|
| + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| + </ClCompile> |
| + <Link> |
| + <SubSystem>Windows</SubSystem> |
| + <GenerateDebugInformation>true</GenerateDebugInformation> |
| + <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base.lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| + <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe</OutputFile> |
| + <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> |
| + </Link> |
| + </ItemDefinitionGroup> |
| + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32'"> |
| + <ClCompile> |
| + <PrecompiledHeader>Create</PrecompiledHeader> |
| + <WarningLevel>Level3</WarningLevel> |
| + <Optimization>Disabled</Optimization> |
| + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</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.
|
| + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| + </ClCompile> |
| + <Link> |
| + <SubSystem>Windows</SubSystem> |
| + <GenerateDebugInformation>true</GenerateDebugInformation> |
| + <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base.lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| + <OutputFile>$(ProjectDir)build\ia32\$(Configuration)\AdblockPlusEngine.exe</OutputFile> |
| + <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> |
| + </Link> |
| + </ItemDefinitionGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Production|x64'"> |
| <ClCompile> |
| <PrecompiledHeader>Create</PrecompiledHeader> |
| <WarningLevel>Level3</WarningLevel> |
| <Optimization>Disabled</Optimization> |
| - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| + </ClCompile> |
| + <Link> |
| + <SubSystem>Windows</SubSystem> |
| + <GenerateDebugInformation>true</GenerateDebugInformation> |
| + <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base.lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| + <OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe</OutputFile> |
| + <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> |
| + </Link> |
| + </ItemDefinitionGroup> |
| + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Test|x64'"> |
| + <ClCompile> |
| + <PrecompiledHeader>Create</PrecompiledHeader> |
| + <WarningLevel>Level3</WarningLevel> |
| + <Optimization>Disabled</Optimization> |
| + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| + </ClCompile> |
| + <Link> |
| + <SubSystem>Windows</SubSystem> |
| + <GenerateDebugInformation>true</GenerateDebugInformation> |
| + <AdditionalDependencies>libadblockplus.lib;shlwapi.lib;user32.lib;v8_base.lib;v8_snapshot.lib;winhttp.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> |
| + <OutputFile>$(ProjectDir)build\x64\$(Configuration)\AdblockPlusEngine.exe</OutputFile> |
| + <DelayLoadDLLs>Shell32.dll</DelayLoadDLLs> |
| + </Link> |
| + </ItemDefinitionGroup> |
| + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'"> |
| + <ClCompile> |
| + <PrecompiledHeader>Create</PrecompiledHeader> |
| + <WarningLevel>Level3</WarningLevel> |
| + <Optimization>Disabled</Optimization> |
| + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;ADBLOCK_PLUS_TEST_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| </ClCompile> |
| <Link> |
| @@ -153,7 +297,7 @@ |
| <Optimization>MaxSpeed</Optimization> |
| <FunctionLevelLinking>true</FunctionLevelLinking> |
| <IntrinsicFunctions>true</IntrinsicFunctions> |
| - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;ADBLOCK_PLUS_PRODUCTION_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
| </ClCompile> |
| <Link> |
« no previous file with comments
|
« AdblockPlus.sln ('k')
|
src/engine/main.cpp » ('j')
|
src/engine/main.cpp » ('J')
