Index: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.CppBuild.targets |
diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.CppBuild.targets b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.CppBuild.targets |
index fb5f5d1033259f3124b63f4e0b3cfa88e5e21692..d08d25f5147dbac41b5690e4e0137ca9c1b80cc7 100644 |
--- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.CppBuild.targets |
+++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/NaCl.CppBuild.targets |
@@ -44,7 +44,8 @@ |
$(VCTargetsPath)\NaCl\Props\nacl_compile.xml; |
$(VCTargetsPath)$(LangID)\custom_build_step.xml; |
"/> |
- <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_link.xml" Condition="'$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary'" /> |
+ <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\pnacl_link.xml" Condition="'$(Platform)' == 'PNaCl' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" /> |
+ <PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_link.xml" Condition="'$(Platform)' != 'PNaCl' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" /> |
<PropertyPageSchema Include="$(VCTargetsPath)\NaCl\Props\nacl_lib.xml" Condition="'$(ConfigurationType)' == 'StaticLibrary'" /> |
</ItemGroup> |