OLD | NEW |
---|---|
1 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | 2 |
3 <PropertyGroup> | 3 <PropertyGroup> |
4 <PlatformShortName>NaCl64</PlatformShortName> | 4 <PlatformShortName>NaCl64</PlatformShortName> |
5 <PlatformArchitecture>64</PlatformArchitecture> | 5 <PlatformArchitecture>64</PlatformArchitecture> |
6 <TargetArchitecture>x86_64</TargetArchitecture> | 6 <TargetArchitecture>x86_64</TargetArchitecture> |
7 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</Pro jectName> | 7 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</Pro jectName> |
8 <TargetName Condition="'$(TargetName)'==''">$(ProjectName)_$(PlatformArchite cture)</TargetName> | 8 <TargetName Condition="'$(TargetName)'==''">$(ProjectName)_$(PlatformArchite cture)</TargetName> |
9 <ToolchainName Condition="'$(ToolchainName)' == ''">newlib</ToolchainName> | 9 <ToolchainName Condition="'$(ToolchainName)' == ''">newlib</ToolchainName> |
10 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(In termediateOutputPath)</IntDir> | |
10 | 11 |
11 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(In termediateOutputPath)</IntDir> | 12 <!-- Set IntDir and OutDir to a dummy value here to stop the builtin Default .props file |
12 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Pl atform)\$(ToolchainName)\$(Configuration)\</IntDir> | 13 from setting them. This allows us to set them to thier real default va lues in the |
binji
2012/11/06 22:33:39
sp: their
| |
13 <OutDir Condition="'$(OutDir)'==''">$(ProjectDir)$(Platform)\$(ToolchainName )\$(Configuration)\</OutDir> | 14 .props file. By which time the user settings for ToolchainName in the v cproj file |
15 will have been set. If we try to use $(ToolchainName) here it will alw ays evaluate | |
16 to newlib. --> | |
17 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">DUMM Y</IntDir> | |
18 <OutDir Condition="'$(OutDir)'==''">DUMMY</OutDir> | |
14 | 19 |
15 <VSNaClSDKRoot Condition="'$(VSNaClSDKRoot)'==''">$(NACL_SDK_ROOT)\</VSNaClS DKRoot> | 20 <VSNaClSDKRoot Condition="'$(VSNaClSDKRoot)'==''">$(NACL_SDK_ROOT)\</VSNaClS DKRoot> |
16 <NaClWebServerPort Condition="'$(NaClWebServerPort)'==''">5103</NaClWebServe rPort> | 21 <NaClWebServerPort Condition="'$(NaClWebServerPort)'==''">5103</NaClWebServe rPort> |
17 <NaClManifestPath Condition="'$(NaClManifestPath)'==''"></NaClManifestPath> | 22 <NaClManifestPath Condition="'$(NaClManifestPath)'==''"></NaClManifestPath> |
18 </PropertyGroup> | 23 </PropertyGroup> |
19 | 24 |
20 <Import Project="$(VCTargetsPath)\NaCl\NaCl.Toolset.default.props" /> | 25 <Import Project="$(VCTargetsPath)\NaCl\NaCl.Toolset.default.props" /> |
21 | 26 |
22 </Project> | 27 </Project> |
OLD | NEW |