Index: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props |
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props |
index 85944f21f0f0737b36a41afdf9c4f4b714ca6f6c..3a7ed8d594765d3290f070be5168c09a71c95a77 100644 |
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props |
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.default.props |
@@ -3,12 +3,13 @@ |
<PlatformShortName>NaCl64</PlatformShortName> |
<PlatformArchitecture>64</PlatformArchitecture> |
<TargetArchitecture>x86_64</TargetArchitecture> |
- |
+ <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> |
+ <TargetName Condition="'$(TargetName)'==''">$(ProjectName)_$(TargetArchitecture)</TargetName> |
<ToolchainName Condition="'$(ToolchainName)' == ''">newlib</ToolchainName> |
<IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'!=''">$(IntermediateOutputPath)</IntDir> |
<IntDir Condition="'$(IntDir)'=='' AND '$(IntermediateOutputPath)'==''">$(Platform)\$(ToolchainName)\$(Configuration)\</IntDir> |
- <OutDir Condition="'$(OutDir)'==''">$(ProjectDir)$(ToolchainName)\</OutDir> |
+ <OutDir Condition="'$(OutDir)'==''">$(SolutionDir)$(Platform)\$(ToolchainName)\$(Configuration)\</OutDir> |
<VSNaClSDKRoot Condition="'$(VSNaClSDKRoot)'==''">$(NACL_SDK_ROOT)\</VSNaClSDKRoot> |
<NaClWebServerPort Condition="'$(NaClWebServerPort)'==''">5103</NaClWebServerPort> |