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>NaClARM</PlatformShortName> |
5 <PlatformArchitecture>64</PlatformArchitecture> | 5 <PlatformArchitecture>arm</PlatformArchitecture> |
6 <TargetArchitecture>x86_64</TargetArchitecture> | 6 <TargetArchitecture>arm</TargetArchitecture> |
7 <PlatformToolset Condition="'$(PlatformToolset)' == ''">v110</PlatformToolse
t> | 7 <PlatformToolset Condition="'$(PlatformToolset)' == ''">v110</PlatformToolse
t> |
8 | 8 |
9 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</Pro
jectName> | 9 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</Pro
jectName> |
10 <TargetName Condition="'$(TargetName)'==''">$(ProjectName)_$(PlatformArchite
cture)</TargetName> | 10 <TargetName Condition="'$(TargetName)'==''">$(ProjectName)_$(PlatformArchite
cture)</TargetName> |
11 <ToolchainName Condition="'$(ToolchainName)' == ''">newlib</ToolchainName> | 11 <ToolchainName Condition="'$(ToolchainName)' == ''">newlib</ToolchainName> |
12 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(In
termediateOutputPath)</IntDir> | 12 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(In
termediateOutputPath)</IntDir> |
13 | 13 |
14 <!-- Set IntDir and OutDir to a dummy value here to stop the builtin Default
.props file | 14 <!-- Set IntDir and OutDir to a dummy value here to stop the builtin Default
.props file |
15 from setting them. This allows us to set them to their real default va
lues in the | 15 from setting them. This allows us to set them to their real default va
lues in the |
16 .props file. By which time the user settings for ToolchainName in the v
cproj file | 16 .props file. By which time the user settings for ToolchainName in the v
cproj file |
17 will have been set. If we try to use $(ToolchainName) here it will alw
ays evaluate | 17 will have been set. If we try to use $(ToolchainName) here it will alw
ays evaluate |
18 to newlib. --> | 18 to newlib. --> |
19 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">DUMM
Y</IntDir> | 19 <IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">DUMM
Y</IntDir> |
20 <OutDir Condition="'$(OutDir)'==''">DUMMY</OutDir> | 20 <OutDir Condition="'$(OutDir)'==''">DUMMY</OutDir> |
21 | 21 |
22 <VSNaClSDKRoot Condition="'$(VSNaClSDKRoot)'==''">$(NACL_SDK_ROOT)\</VSNaClS
DKRoot> | 22 <VSNaClSDKRoot Condition="'$(VSNaClSDKRoot)'==''">$(NACL_SDK_ROOT)\</VSNaClS
DKRoot> |
| 23 |
| 24 <NaClToolchainRoot>$(VSNaClSDKRoot)toolchain\win_arm_$(ToolchainName)\</NaCl
ToolchainRoot> |
| 25 |
| 26 <NaClDefaultIncludePath Condition="'$(NaClDefaultIncludePath)'==''">$(NaClTo
olchainRoot)$(TargetArchitecture)-nacl\usr\include;$(NaClToolchainRoot)arm-nacl\
include</NaClDefaultIncludePath> |
| 27 |
| 28 <NaClDefaultIncludePath Condition="Exists('$(NaClToolchainRoot)lib\gcc\arm-n
acl\4.8.2')">$(NaClDefaultIncludePath);$(NaClToolchainRoot)arm-nacl\include\c++\
4.8.2;$(NaClToolchainRoot)lib\gcc\arm-nacl\4.8.2\include</NaClDefaultIncludePath
> |
| 29 |
| 30 <NaClDefaultIncludePath Condition="Exists('$(NaClToolchainRoot)lib\gcc\arm-n
acl\4.8.3')">$(NaClDefaultIncludePath);$(NaClToolchainRoot)arm-nacl\include\c++\
4.8.3;$(NaClToolchainRoot)lib\gcc\arm-nacl\4.8.3\include</NaClDefaultIncludePath
> |
| 31 |
23 <NaClWebServerPort Condition="'$(NaClWebServerPort)'==''">5103</NaClWebServe
rPort> | 32 <NaClWebServerPort Condition="'$(NaClWebServerPort)'==''">5103</NaClWebServe
rPort> |
24 <NaClIndexHTML Condition="'$(NaClIndexHTML)'==''">index.html</NaClIndexHTML> | 33 <NaClIndexHTML Condition="'$(NaClIndexHTML)'==''">index.html</NaClIndexHTML> |
25 <NaClManifestPath Condition="'$(NaClManifestPath)'==''"></NaClManifestPath> | 34 <NaClManifestPath Condition="'$(NaClManifestPath)'==''"></NaClManifestPath> |
26 </PropertyGroup> | 35 </PropertyGroup> |
27 | 36 |
28 <Import Project="$(VCTargetsPath)\NaCl\NaCl.Toolset.default.props" /> | 37 <Import Project="$(VCTargetsPath)\NaCl\NaCl.Toolset.default.props" /> |
29 | 38 |
30 </Project> | 39 </Project> |
OLD | NEW |