| Index: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props
|
| diff --git a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props
|
| index 9991430af2ea8f902330c3921bb000c2a1d58f89..be2e834395e22b81e25266f95f92eee746ad3331 100644
|
| --- a/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props
|
| +++ b/visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.props
|
| @@ -1,34 +1,34 @@
|
| -<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
| - <Import Project="$(VCTargetsPath)\NaCl\ImportBefore\*.props" Condition="Exists('$(VCTargetsPath)\NaCl\ImportBefore')" />
|
| - <Import Condition="'$(ToolchainName)' == 'newlib' AND (exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.props'))" Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.props"/>
|
| - <Import Condition="'$(ToolchainName)' == 'glibc' AND (exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.win_x86_glibc.props'))" Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.win_x86_glibc.props"/>
|
| -
|
| - <PropertyGroup>
|
| - <DebuggerFlavor Condition="'$(DebuggerFlavor)'==''">WindowsLocalDebugger</DebuggerFlavor>
|
| - </PropertyGroup>
|
| -
|
| - <Import Project="$(VCTargetsPath)\NaCl\NaCl.Toolset.default.props" />
|
| -
|
| - <PropertyGroup>
|
| - <IgnoreImportLibrary>true</IgnoreImportLibrary>
|
| - <GenerateManifest>false</GenerateManifest>
|
| - </PropertyGroup>
|
| -
|
| - <PropertyGroup Condition="'$(ConfigurationType)' == 'Application'">
|
| - <LinkCompiled>true</LinkCompiled>
|
| - <TargetExt>.nexe</TargetExt>
|
| - </PropertyGroup>
|
| -
|
| - <PropertyGroup Condition="'$(ConfigurationType)' == 'DynamicLibrary'">
|
| - <LinkCompiled>true</LinkCompiled>
|
| - <TargetExt>.so</TargetExt>
|
| - </PropertyGroup>
|
| -
|
| - <PropertyGroup Condition="'$(ConfigurationType)' == 'StaticLibrary'">
|
| - <LibCompiled>true</LibCompiled>
|
| - <TargetExt>.a</TargetExt>
|
| - </PropertyGroup>
|
| -
|
| - <Import Project="$(VCTargetsPath)\NaCl\NaCl.Paths.default.props" />
|
| - <Import Project="$(VCTargetsPath)\NaCl\ImportAfter\*.props" Condition="Exists('$(VCTargetsPath)\NaCl\ImportAfter')" />
|
| -</Project>
|
| +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
| + <Import Project="$(VCTargetsPath)\NaCl\ImportBefore\*.props" Condition="Exists('$(VCTargetsPath)\NaCl\ImportBefore')" />
|
| + <Import Condition="'$(ToolchainName)' == 'newlib' AND (exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.props'))" Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86_newlib.props"/>
|
| + <Import Condition="'$(ToolchainName)' == 'glibc' AND (exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.win_x86_glibc.props'))" Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl.win_x86_glibc.props"/>
|
| +
|
| + <PropertyGroup>
|
| + <DebuggerFlavor Condition="'$(DebuggerFlavor)'==''">WindowsLocalDebugger</DebuggerFlavor>
|
| + </PropertyGroup>
|
| +
|
| + <Import Project="$(VCTargetsPath)\NaCl\NaCl.Toolset.default.props" />
|
| +
|
| + <PropertyGroup>
|
| + <IgnoreImportLibrary>true</IgnoreImportLibrary>
|
| + <GenerateManifest>false</GenerateManifest>
|
| + </PropertyGroup>
|
| +
|
| + <PropertyGroup Condition="'$(ConfigurationType)' == 'Application'">
|
| + <LinkCompiled>true</LinkCompiled>
|
| + <TargetExt>.nexe</TargetExt>
|
| + </PropertyGroup>
|
| +
|
| + <PropertyGroup Condition="'$(ConfigurationType)' == 'DynamicLibrary'">
|
| + <LinkCompiled>true</LinkCompiled>
|
| + <TargetExt>.so</TargetExt>
|
| + </PropertyGroup>
|
| +
|
| + <PropertyGroup Condition="'$(ConfigurationType)' == 'StaticLibrary'">
|
| + <LibCompiled>true</LibCompiled>
|
| + <TargetExt>.a</TargetExt>
|
| + </PropertyGroup>
|
| +
|
| + <Import Project="$(VCTargetsPath)\NaCl\NaCl.Paths.default.props" />
|
| + <Import Project="$(VCTargetsPath)\NaCl\ImportAfter\*.props" Condition="Exists('$(VCTargetsPath)\NaCl\ImportAfter')" />
|
| +</Project>
|
|
|