mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-25 18:53:53 +08:00
169 lines
8.6 KiB
Diff
169 lines
8.6 KiB
Diff
|
diff --git a/SMP/smp_deps.props b/SMP/smp_deps.props
|
||
|
index 1eade47..ab279f4 100644
|
||
|
--- a/SMP/smp_deps.props
|
||
|
+++ b/SMP/smp_deps.props
|
||
|
@@ -193,6 +193,7 @@
|
||
|
<ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
|
||
|
<MinimalRebuild>false</MinimalRebuild>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Lib>
|
||
|
<OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
|
||
|
@@ -211,6 +212,7 @@
|
||
|
<ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
|
||
|
<MinimalRebuild>false</MinimalRebuild>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Lib>
|
||
|
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
|
||
|
@@ -230,6 +232,7 @@
|
||
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||
|
<MinimalRebuild>false</MinimalRebuild>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Link>
|
||
|
<OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
|
||
|
@@ -253,6 +256,7 @@
|
||
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||
|
<MinimalRebuild>false</MinimalRebuild>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Link>
|
||
|
<OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
|
||
|
@@ -282,6 +286,7 @@
|
||
|
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
|
||
|
<ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Lib>
|
||
|
<OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
|
||
|
@@ -307,6 +312,7 @@
|
||
|
<InterproceduralOptimization>SingleFile</InterproceduralOptimization>
|
||
|
<ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Lib>
|
||
|
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
|
||
|
@@ -331,6 +337,7 @@
|
||
|
<AdditionalIncludeDirectories>$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Link>
|
||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||
|
@@ -362,6 +369,7 @@
|
||
|
<AdditionalIncludeDirectories>$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Link>
|
||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||
|
@@ -392,6 +400,7 @@
|
||
|
<AdditionalIncludeDirectories>$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Link>
|
||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||
|
@@ -423,6 +432,7 @@
|
||
|
<AdditionalIncludeDirectories>$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||
|
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Link>
|
||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||
|
diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props
|
||
|
index b44482c..35ae231 100644
|
||
|
--- a/SMP/smp_winrt_deps.props
|
||
|
+++ b/SMP/smp_winrt_deps.props
|
||
|
@@ -206,6 +206,7 @@
|
||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||
|
<CompileAsWinRT>false</CompileAsWinRT>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Lib>
|
||
|
<OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
|
||
|
@@ -226,6 +227,7 @@
|
||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||
|
<CompileAsWinRT>false</CompileAsWinRT>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Lib>
|
||
|
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
|
||
|
@@ -247,6 +249,7 @@
|
||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||
|
<CompileAsWinRT>false</CompileAsWinRT>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Link>
|
||
|
<OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
|
||
|
@@ -274,6 +277,7 @@
|
||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||
|
<CompileAsWinRT>false</CompileAsWinRT>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Link>
|
||
|
<OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
|
||
|
@@ -307,6 +311,7 @@
|
||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||
|
<CompileAsWinRT>false</CompileAsWinRT>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Lib>
|
||
|
<OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
|
||
|
@@ -335,6 +340,7 @@
|
||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||
|
<CompileAsWinRT>false</CompileAsWinRT>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Lib>
|
||
|
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
|
||
|
@@ -361,6 +367,7 @@
|
||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||
|
<CompileAsWinRT>false</CompileAsWinRT>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Link>
|
||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||
|
@@ -396,6 +403,7 @@
|
||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||
|
<CompileAsWinRT>false</CompileAsWinRT>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Link>
|
||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||
|
@@ -430,6 +438,7 @@
|
||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||
|
<CompileAsWinRT>false</CompileAsWinRT>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Link>
|
||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||
|
@@ -465,6 +474,7 @@
|
||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||
|
<CompileAsWinRT>false</CompileAsWinRT>
|
||
|
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
|
||
|
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||
|
</ClCompile>
|
||
|
<Link>
|
||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|