Skip to content
Snippets Groups Projects
Commit 14eb3e66 authored by Stephen Hurd's avatar Stephen Hurd
Browse files

Massage overlapping patches

parent f775f991
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
patches/cl-static-library.patch
+ 9
− 4
View file @ 14eb3e66
--- ../orig/crypt32.vcxproj 2019-01-31 03:34:12.000000000 -0500 --- ../orig/crypt32.vcxproj 2019-01-31 03:34:12.000000000 -0500
+++ crypt32.vcxproj 2022-02-27 14:30:15.454574000 -0500 +++ crypt32.vcxproj 2022-02-27 14:30:15.454574000 -0500
@@ -32,26 +32,26 @@ @@ -32,27 +32,27 @@
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
...@@ -8,14 +8,16 @@ ...@@ -8,14 +8,16 @@
+ <ConfigurationType>StaticLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet> <CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v140</PlatformToolset> - <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType> - <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <ConfigurationType>StaticLibrary</ConfigurationType> + <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet> <CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v140</PlatformToolset> - <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType> - <ConfigurationType>DynamicLibrary</ConfigurationType>
...@@ -23,7 +25,8 @@ ...@@ -23,7 +25,8 @@
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet> <CharacterSet>NotSet</CharacterSet>
<PlatformToolset>v140</PlatformToolset> - <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType> - <ConfigurationType>DynamicLibrary</ConfigurationType>
...@@ -31,3 +34,5 @@ ...@@ -31,3 +34,5 @@
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet> <CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
patches/cl-windowsbuildfix.patch
+ 0
− 32
View file @ 14eb3e66
--- crypt32.vcxproj.orig 2022-02-25 04:07:11.835347000 -0500 --- crypt32.vcxproj.orig 2022-02-25 04:07:11.835347000 -0500
+++ crypt32.vcxproj 2022-02-25 04:07:36.519348000 -0500 +++ crypt32.vcxproj 2022-02-25 04:07:36.519348000 -0500
@@ -35,27 +35,27 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -401,9 +401,6 @@ @@ -401,9 +401,6 @@
<ClCompile Include="envelope\res_env.c" /> <ClCompile Include="envelope\res_env.c" />
<ClCompile Include="io\dns.c" /> <ClCompile Include="io\dns.c" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment