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

Side by Side Diff: MSVS/libadblockplus.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.
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 | MSVS/tests.vcxproj » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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|Win32"> 4 <ProjectConfiguration Include="Debug|Win32">
5 <Configuration>Debug</Configuration> 5 <Configuration>Debug</Configuration>
6 <Platform>Win32</Platform> 6 <Platform>Win32</Platform>
7 </ProjectConfiguration> 7 </ProjectConfiguration>
8 <ProjectConfiguration Include="Debug|x64">
9 <Configuration>Debug</Configuration>
10 <Platform>x64</Platform>
11 </ProjectConfiguration>
8 <ProjectConfiguration Include="Release|Win32"> 12 <ProjectConfiguration Include="Release|Win32">
9 <Configuration>Release</Configuration> 13 <Configuration>Release</Configuration>
10 <Platform>Win32</Platform> 14 <Platform>Win32</Platform>
11 </ProjectConfiguration> 15 </ProjectConfiguration>
16 <ProjectConfiguration Include="Release|x64">
17 <Configuration>Release</Configuration>
18 <Platform>x64</Platform>
19 </ProjectConfiguration>
12 </ItemGroup> 20 </ItemGroup>
13 <PropertyGroup Label="Globals"> 21 <PropertyGroup Label="Globals">
14 <ProjectGuid>{E60284DC-2131-D9A9-D19C-B792B7F5F727}</ProjectGuid> 22 <ProjectGuid>{E60284DC-2131-D9A9-D19C-B792B7F5F727}</ProjectGuid>
15 <Keyword>Win32Proj</Keyword> 23 <Keyword>Win32Proj</Keyword>
16 <RootNamespace>libadblockplus</RootNamespace> 24 <RootNamespace>libadblockplus</RootNamespace>
17 </PropertyGroup> 25 </PropertyGroup>
18 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 26 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
19 <PropertyGroup Label="Configuration"> 27 <PropertyGroup Label="Configuration">
20 <CharacterSet>Unicode</CharacterSet> 28 <CharacterSet>Unicode</CharacterSet>
21 <ConfigurationType>StaticLibrary</ConfigurationType> 29 <ConfigurationType>StaticLibrary</ConfigurationType>
22 </PropertyGroup> 30 </PropertyGroup>
23 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)' =='Debug|Win32'"> 31 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)' =='Debug|Win32'">
24 <PlatformToolset>v110</PlatformToolset> 32 <PlatformToolset>v110</PlatformToolset>
25 </PropertyGroup> 33 </PropertyGroup>
34 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label=" Configuration">
35 <PlatformToolset>v110</PlatformToolset>
36 </PropertyGroup>
26 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)' =='Release|Win32'"> 37 <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)' =='Release|Win32'">
27 <PlatformToolset>v110</PlatformToolset> 38 <PlatformToolset>v110</PlatformToolset>
28 </PropertyGroup> 39 </PropertyGroup>
40 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label ="Configuration">
41 <PlatformToolset>v110</PlatformToolset>
42 </PropertyGroup>
29 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 43 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
30 <ImportGroup Label="ExtensionSettings" /> 44 <ImportGroup Label="ExtensionSettings" />
31 <ImportGroup Label="PropertySheets"> 45 <ImportGroup Label="PropertySheets">
32 <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.pro ps')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platf orm).user.props" /> 46 <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.pro ps')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platf orm).user.props" />
33 </ImportGroup> 47 </ImportGroup>
34 <PropertyGroup Label="UserMacros" /> 48 <PropertyGroup Label="UserMacros" />
35 <PropertyGroup> 49 <PropertyGroup>
36 <ExecutablePath>$(ExecutablePath);$(MSBuildProjectDirectory)\..\bin\;$(MSBui ldProjectDirectory)\..\bin\</ExecutablePath> 50 <ExecutablePath>$(ExecutablePath);$(MSBuildProjectDirectory)\..\bin\;$(MSBui ldProjectDirectory)\..\bin\</ExecutablePath>
37 <OutDir>..\build\$(Configuration)\</OutDir> 51 <OutDir>..\build\$(Configuration)\</OutDir>
38 <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir> 52 <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir>
39 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" >false</LinkIncremental> 53 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" >false</LinkIncremental>
54 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">f alse</LinkIncremental>
40 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">t rue</LinkIncremental> 55 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">t rue</LinkIncremental>
56 <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">tru e</LinkIncremental>
41 <TargetName>$(ProjectName)</TargetName> 57 <TargetName>$(ProjectName)</TargetName>
42 <TargetPath>$(OutDir)lib\$(ProjectName)$(TargetExt)</TargetPath> 58 <TargetPath>$(OutDir)lib\$(ProjectName)$(TargetExt)</TargetPath>
43 </PropertyGroup> 59 </PropertyGroup>
44 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" > 60 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" >
45 <ClCompile> 61 <ClCompile>
46 <AdditionalIncludeDirectories>..\include;..\third_party\v8\include;%(Addit ionalIncludeDirectories)</AdditionalIncludeDirectories> 62 <AdditionalIncludeDirectories>..\include;..\third_party\v8\include;%(Addit ionalIncludeDirectories)</AdditionalIncludeDirectories>
47 <Optimization>Disabled</Optimization> 63 <Optimization>Disabled</Optimization>
48 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;FILTER_ENGINE_STUBS=1;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS ;OBJECT_PRINT;VERIFY_HEAP;ENABLE_EXTRA_CHECKS;%(PreprocessorDefinitions)</Prepro cessorDefinitions> 64 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;FILTER_ENGINE_STUBS=1;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS ;OBJECT_PRINT;VERIFY_HEAP;ENABLE_EXTRA_CHECKS;%(PreprocessorDefinitions)</Prepro cessorDefinitions>
49 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> 65 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
50 </ClCompile> 66 </ClCompile>
51 <Lib> 67 <Lib>
52 <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> 68 <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile>
53 </Lib> 69 </Lib>
54 <Link> 70 <Link>
55 <AdditionalDependencies> 71 <AdditionalDependencies>
56 </AdditionalDependencies> 72 </AdditionalDependencies>
57 </Link> 73 </Link>
58 <ResourceCompile> 74 <ResourceCompile>
59 <AdditionalIncludeDirectories>..\include;..\third_party\v8\include;%(Addit ionalIncludeDirectories)</AdditionalIncludeDirectories> 75 <AdditionalIncludeDirectories>..\include;..\third_party\v8\include;%(Addit ionalIncludeDirectories)</AdditionalIncludeDirectories>
60 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;FILTER_ENGINE_STUBS=1;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS ;OBJECT_PRINT;VERIFY_HEAP;ENABLE_EXTRA_CHECKS;%(PreprocessorDefinitions);%(Prepr ocessorDefinitions)</PreprocessorDefinitions> 76 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;FILTER_ENGINE_STUBS=1;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS ;OBJECT_PRINT;VERIFY_HEAP;ENABLE_EXTRA_CHECKS;%(PreprocessorDefinitions);%(Prepr ocessorDefinitions)</PreprocessorDefinitions>
61 </ResourceCompile> 77 </ResourceCompile>
62 </ItemDefinitionGroup> 78 </ItemDefinitionGroup>
79 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
80 <ClCompile>
81 <AdditionalIncludeDirectories>..\include;..\third_party\v8\include;%(Addit ionalIncludeDirectories)</AdditionalIncludeDirectories>
82 <Optimization>Disabled</Optimization>
83 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;FILTER_ENGINE_STUBS=1;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS ;OBJECT_PRINT;VERIFY_HEAP;ENABLE_EXTRA_CHECKS;%(PreprocessorDefinitions)</Prepro cessorDefinitions>
84 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
85 </ClCompile>
86 <Lib>
87 <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile>
88 </Lib>
89 <Link>
90 <AdditionalDependencies>
91 </AdditionalDependencies>
92 </Link>
93 <ResourceCompile>
94 <AdditionalIncludeDirectories>..\include;..\third_party\v8\include;%(Addit ionalIncludeDirectories)</AdditionalIncludeDirectories>
95 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;FILTER_ENGINE_STUBS=1;DEBUG;ENABLE_DISASSEMBLER;V8_ENABLE_CHECKS ;OBJECT_PRINT;VERIFY_HEAP;ENABLE_EXTRA_CHECKS;%(PreprocessorDefinitions);%(Prepr ocessorDefinitions)</PreprocessorDefinitions>
96 </ResourceCompile>
97 </ItemDefinitionGroup>
63 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32 '"> 98 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32 '">
64 <ClCompile> 99 <ClCompile>
65 <AdditionalIncludeDirectories>..\include;..\third_party\v8\include;%(Addit ionalIncludeDirectories)</AdditionalIncludeDirectories> 100 <AdditionalIncludeDirectories>..\include;..\third_party\v8\include;%(Addit ionalIncludeDirectories)</AdditionalIncludeDirectories>
66 <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed> 101 <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
67 <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> 102 <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
68 <IntrinsicFunctions>true</IntrinsicFunctions> 103 <IntrinsicFunctions>true</IntrinsicFunctions>
69 <Optimization>MaxSpeed</Optimization> 104 <Optimization>MaxSpeed</Optimization>
70 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;FILTER_ENGINE_STUBS=1;%(PreprocessorDefinitions)</PreprocessorDe finitions> 105 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;FILTER_ENGINE_STUBS=1;%(PreprocessorDefinitions)</PreprocessorDe finitions>
71 <RuntimeLibrary>MultiThreaded</RuntimeLibrary> 106 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
72 <StringPooling>true</StringPooling> 107 <StringPooling>true</StringPooling>
73 </ClCompile> 108 </ClCompile>
74 <Lib> 109 <Lib>
75 <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile> 110 <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile>
76 </Lib> 111 </Lib>
77 <Link> 112 <Link>
78 <AdditionalDependencies> 113 <AdditionalDependencies>
79 </AdditionalDependencies> 114 </AdditionalDependencies>
80 <EnableCOMDATFolding>true</EnableCOMDATFolding> 115 <EnableCOMDATFolding>true</EnableCOMDATFolding>
81 <OptimizeReferences>true</OptimizeReferences> 116 <OptimizeReferences>true</OptimizeReferences>
82 </Link> 117 </Link>
83 <ResourceCompile> 118 <ResourceCompile>
84 <AdditionalIncludeDirectories>..\include;..\third_party\v8\include;%(Addit ionalIncludeDirectories)</AdditionalIncludeDirectories> 119 <AdditionalIncludeDirectories>..\include;..\third_party\v8\include;%(Addit ionalIncludeDirectories)</AdditionalIncludeDirectories>
85 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;FILTER_ENGINE_STUBS=1;%(PreprocessorDefinitions);%(PreprocessorD efinitions)</PreprocessorDefinitions> 120 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;FILTER_ENGINE_STUBS=1;%(PreprocessorDefinitions);%(PreprocessorD efinitions)</PreprocessorDefinitions>
86 </ResourceCompile> 121 </ResourceCompile>
87 </ItemDefinitionGroup> 122 </ItemDefinitionGroup>
123 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" >
124 <ClCompile>
125 <AdditionalIncludeDirectories>..\include;..\third_party\v8\include;%(Addit ionalIncludeDirectories)</AdditionalIncludeDirectories>
126 <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
127 <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
128 <IntrinsicFunctions>true</IntrinsicFunctions>
129 <Optimization>MaxSpeed</Optimization>
130 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;FILTER_ENGINE_STUBS=1;%(PreprocessorDefinitions)</PreprocessorDe finitions>
131 <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
132 <StringPooling>true</StringPooling>
133 </ClCompile>
134 <Lib>
135 <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile>
136 </Lib>
137 <Link>
138 <AdditionalDependencies>
139 </AdditionalDependencies>
140 <EnableCOMDATFolding>true</EnableCOMDATFolding>
141 <OptimizeReferences>true</OptimizeReferences>
142 </Link>
143 <ResourceCompile>
144 <AdditionalIncludeDirectories>..\include;..\third_party\v8\include;%(Addit ionalIncludeDirectories)</AdditionalIncludeDirectories>
145 <PreprocessorDefinitions>ENABLE_LATIN_1;ENABLE_DEBUGGER_SUPPORT;V8_TARGET_ ARCH_IA32;WIN32;FILTER_ENGINE_STUBS=1;%(PreprocessorDefinitions);%(PreprocessorD efinitions)</PreprocessorDefinitions>
146 </ResourceCompile>
147 </ItemDefinitionGroup>
88 <ItemGroup> 148 <ItemGroup>
89 <None Include="..\libadblockplus.gyp" /> 149 <None Include="..\libadblockplus.gyp" />
90 <None Include="..\lib\utils.js"> 150 <None Include="..\lib\utils.js">
91 <ExcludedFromBuild>true</ExcludedFromBuild> 151 <ExcludedFromBuild>true</ExcludedFromBuild>
92 </None> 152 </None>
93 <None Include="..\lib\io.js"> 153 <None Include="..\lib\io.js">
94 <ExcludedFromBuild>true</ExcludedFromBuild> 154 <ExcludedFromBuild>true</ExcludedFromBuild>
95 </None> 155 </None>
96 <None Include="..\lib\prefs.js"> 156 <None Include="..\lib\prefs.js">
97 <ExcludedFromBuild>true</ExcludedFromBuild> 157 <ExcludedFromBuild>true</ExcludedFromBuild>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 </ItemGroup> 202 </ItemGroup>
143 <ItemGroup> 203 <ItemGroup>
144 <ProjectReference Include="third_party\v8\tools\gyp\v8.vcxproj"> 204 <ProjectReference Include="third_party\v8\tools\gyp\v8.vcxproj">
145 <Project>{FBB6CB62-DDEE-671E-D69F-37E0F0A1B214}</Project> 205 <Project>{FBB6CB62-DDEE-671E-D69F-37E0F0A1B214}</Project>
146 <ReferenceOutputAssembly>false</ReferenceOutputAssembly> 206 <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
147 </ProjectReference> 207 </ProjectReference>
148 </ItemGroup> 208 </ItemGroup>
149 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 209 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
150 <ImportGroup Label="ExtensionTargets" /> 210 <ImportGroup Label="ExtensionTargets" />
151 </Project> 211 </Project>
OLDNEW
« no previous file with comments | « no previous file | MSVS/tests.vcxproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld