Unified Diff: MSVS/tests.vcxproj
Issue 10169005:
Windows specific changes. All tests passing on Windows. (Closed)
Patch Set: Comments address. WIN32 in #ifdef and whitespace
Created April 10, 2013, 7:55 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« MSVS/libadblockplus.vcxproj ('k')
|
include/AdblockPlus/FilterEngine.h » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: MSVS/tests.vcxproj |
| =================================================================== |
| --- a/MSVS/tests.vcxproj |
| +++ b/MSVS/tests.vcxproj |
| @@ -5,10 +5,18 @@ |
| <Configuration>Debug</Configuration> |
| <Platform>Win32</Platform> |
| </ProjectConfiguration> |
| + <ProjectConfiguration Include="Debug|x64"> |
| + <Configuration>Debug</Configuration> |
| + <Platform>x64</Platform> |
| + </ProjectConfiguration> |
| <ProjectConfiguration Include="Release|Win32"> |
| <Configuration>Release</Configuration> |
| <Platform>Win32</Platform> |
| </ProjectConfiguration> |
| + <ProjectConfiguration Include="Release|x64"> |
| + <Configuration>Release</Configuration> |
| + <Platform>x64</Platform> |
| + </ProjectConfiguration> |
| </ItemGroup> |
| <PropertyGroup Label="Globals"> |
| <ProjectGuid>{C7A34BAE-71B0-7ABD-0AA5-19B8A1B9AB2F}</ProjectGuid> |
| @@ -23,9 +31,15 @@ |
| <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| <PlatformToolset>v110</PlatformToolset> |
| </PropertyGroup> |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
| + <PlatformToolset>v110</PlatformToolset> |
| + </PropertyGroup> |
| <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| <PlatformToolset>v110</PlatformToolset> |
| </PropertyGroup> |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> |
| + <PlatformToolset>v110</PlatformToolset> |
| + </PropertyGroup> |
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| <ImportGroup Label="ExtensionSettings" /> |
| <ImportGroup Label="PropertySheets"> |
| @@ -37,13 +51,18 @@ |
| <OutDir>..\build\$(Configuration)\</OutDir> |
| <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir> |
| <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> |
| + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> |
| <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> |
| + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> |
| <TargetName>$(ProjectName)</TargetName> |
| <TargetPath>$(OutDir)\$(ProjectName)$(TargetExt)</TargetPath> |
| </PropertyGroup> |
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild> |
| </PropertyGroup> |
| + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
| + <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild> |
| + </PropertyGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| <ClCompile> |
| <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\googletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| @@ -75,6 +94,37 @@ |
| <Command>"$(TargetDir)$(TargetFileName)”</Command> |
| </PostBuildEvent> |
| </ItemDefinitionGroup> |
| + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> |
| + <ClCompile> |
| + <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\googletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + <Optimization>Disabled</Optimization> |
| + <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ARCH_IA32;WIN32;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS;OBJECT_PRINT;VERIFY_HEAP;ENABLE_EXTRA_CHECKS;_VARIADIC_MAX=10;FILTER_ENGINE_STUBS=1;_WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> |
| + <CompileAsWinRT> |
| + </CompileAsWinRT> |
| + <MultiProcessorCompilation>true</MultiProcessorCompilation> |
| + </ClCompile> |
| + <Link> |
| + <AdditionalDependencies>winmm.lib;ws2_32.lib;</AdditionalDependencies> |
| + <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile> |
| + <IgnoreSpecificDefaultLibraries> |
| + </IgnoreSpecificDefaultLibraries> |
| + <IgnoreAllDefaultLibraries> |
| + </IgnoreAllDefaultLibraries> |
| + <SubSystem>Console</SubSystem> |
| + <AssemblyDebug>true</AssemblyDebug> |
| + <GenerateDebugInformation>true</GenerateDebugInformation> |
| + <NoEntryPoint>false</NoEntryPoint> |
| + <EntryPointSymbol>mainCRTStartup</EntryPointSymbol> |
| + </Link> |
| + <ResourceCompile> |
| + <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\googletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ARCH_IA32;WIN32;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS;OBJECT_PRINT;VERIFY_HEAP;ENABLE_EXTRA_CHECKS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| + </ResourceCompile> |
| + <PostBuildEvent> |
| + <Command>"$(TargetDir)$(TargetFileName)”</Command> |
| + </PostBuildEvent> |
| + </ItemDefinitionGroup> |
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| <ClCompile> |
| <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\googletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| @@ -97,6 +147,28 @@ |
| <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ARCH_IA32;WIN32;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| </ResourceCompile> |
| </ItemDefinitionGroup> |
| + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
| + <ClCompile> |
| + <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\googletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> |
| + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> |
| + <IntrinsicFunctions>true</IntrinsicFunctions> |
| + <Optimization>MaxSpeed</Optimization> |
| + <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ARCH_IA32;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| + <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
| + <StringPooling>true</StringPooling> |
| + </ClCompile> |
| + <Link> |
| + <AdditionalDependencies>winmm.lib;ws2_32.lib</AdditionalDependencies> |
| + <EnableCOMDATFolding>true</EnableCOMDATFolding> |
| + <OptimizeReferences>true</OptimizeReferences> |
| + <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile> |
| + </Link> |
| + <ResourceCompile> |
| + <AdditionalIncludeDirectories>..\third_party\googletest;..\third_party\googletest\include;..\include;..\third_party\v8\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |
| + <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ARCH_IA32;WIN32;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| + </ResourceCompile> |
| + </ItemDefinitionGroup> |
| <ItemGroup> |
| <None Include="..\libadblockplus.gyp" /> |
| </ItemGroup> |
« no previous file with comments
|
« MSVS/libadblockplus.vcxproj ('k')
|
include/AdblockPlus/FilterEngine.h » ('j')
|
no next file with comments »
