提交 4d866647 编写于 作者: V Vatsan Madhavan 提交者: Ryland Alaniz

Ensure Link.AdditionalLibraryDirectories are initialized correctly

上级 e3e2bbd6
......@@ -122,10 +122,6 @@
<!-- Always use Static VC Runtime -->
<UseStaticVCRT Condition="'$(UseStaticVCRT)'==''">true</UseStaticVCRT>
<!-- Set up Directories -->
<VcrtLibDir>$(VCToolsInstallDir)lib\$(Architecture)\</VcrtLibDir>
<UcrtLibDir>$(UniversalCRTSdkDir)Lib\$(WindowsTargetPlatformVersion)\UCRT\$(Architecture)\</UcrtLibDir>
<LibSuffix Condition="'$(Configuration)'=='Debug'">d</LibSuffix>
<!-- Always link to oldnames.lib and legacy_stdio_wide_specifiers.lib -->
......@@ -266,8 +262,6 @@
<AdditionalOptions Condition="'$(ManagedCxx)'=='false'">%(AdditionalOptions) /MACHINE:$(Architecture)</AdditionalOptions>
<TargetMachine>Machine$(Architecture)</TargetMachine>
<AdditionalLibraryDirectories Condition="('$(ManagedCxx)'=='false') and ('$(ExplicitCrts)'=='true')">$(VcrtLibDir);$(UcrtLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies Condition="('$(ManagedCxx)'=='false') and ('$(ExplicitCrts)'=='true')">%(AdditionalDependencies);$(StandardLibrariesForNativeCpp)</AdditionalDependencies>
<AdditionalOptions Condition="('$(ManagedCxx)'=='false') and ('$(ExplicitCrts)'=='true')">%(AdditionalOptions) $(NoDefaultLibClauseForRuntimeLibs) $(DisallowLibClause)</AdditionalOptions>
<AdditionalOptions Condition="'$(DllRenameClause)'!=''">%(AdditionalOptions) $(DllRenameClause)</AdditionalOptions>
......
......@@ -4,6 +4,15 @@
<NativeVersionFileDirectory>$([System.IO.Path]::GetDirectoryName($(NativeVersionFile)))</NativeVersionFileDirectory>
<NativeResourceFileWithVersionInformation Condition="'$(NativeResourceFileWithVersionInformation)' == ''">$(IntermediateOutputPath)ExtendedNativeVersion.rc</NativeResourceFileWithVersionInformation>
</PropertyGroup>
<PropertyGroup>
<!--
Set up Directories
Must be done after importing Microsoft.Cpp.VCTools.props
-->
<VcrtLibDir>$(VCToolsInstallDir)lib\$(Architecture)\</VcrtLibDir>
<UcrtLibDir>$(UniversalCRTSdkDir)Lib\$(WindowsTargetPlatformVersion)\UCRT\$(Architecture)\</UcrtLibDir>
</PropertyGroup>
<Import Project="Wpf.Cpp.PrivateTools.targets" Condition="Exists('Wpf.Cpp.PrivateTools.targets') And '$(UsePrivateCppTools)'=='true'"/>
......@@ -27,6 +36,9 @@
'$(ConfigurationType)' == '$(StaticLibrary)' and
'$(RepositoryName)' == 'dotnet-wpf-int'">oldStyle</DebugInformationFormat>
</ClCompile>
<Link>
<AdditionalLibraryDirectories Condition="('$(ExplicitCrts)'=='true')">$(VcrtLibDir);$(UcrtLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(NativeVersionFileDirectory)</AdditionalIncludeDirectories>
</ResourceCompile>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册