mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 19:19:01 +08:00
1e767d2ca4
Fixes https://github.com/microsoft/vcpkg/issues/38985 - [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [X] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [ ] ~~Any patches that are no longer applied are deleted from the port's directory.~~ - [X] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [X] Only one version is added to each modified port's versions file. Compile test pass with following triplets: ``` x64-windows x64-windows-static ```
53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
diff --git a/win32/Scintilla.vcxproj b/win32/Scintilla.vcxproj
|
|
index 82aa9b7..6b6f340 100644
|
|
--- a/win32/Scintilla.vcxproj
|
|
+++ b/win32/Scintilla.vcxproj
|
|
@@ -102,6 +102,7 @@
|
|
<ClCompile>
|
|
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
|
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
|
</ClCompile>
|
|
<Link>
|
|
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
|
@@ -112,6 +113,7 @@
|
|
<ClCompile>
|
|
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
|
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
|
</ClCompile>
|
|
<Link>
|
|
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
|
@@ -122,6 +124,7 @@
|
|
<ClCompile>
|
|
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
|
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
|
</ClCompile>
|
|
<Link>
|
|
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
|
@@ -133,6 +136,7 @@
|
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
|
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
|
</ClCompile>
|
|
<Link>
|
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
@@ -146,6 +150,7 @@
|
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
|
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
|
</ClCompile>
|
|
<Link>
|
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
@@ -159,6 +164,7 @@
|
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
|
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
|
</ClCompile>
|
|
<Link>
|
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|