From ab4e15e68ab88eab728727e376d1ae80640610c6 Mon Sep 17 00:00:00 2001
From: Stephen Hurd <deuce@synchro.net>
Date: Sun, 27 Feb 2022 15:18:49 -0500
Subject: [PATCH] More static lib hackery
---
patches/cl-static-library.patch | 50 ++++++++++++++++++++++++++++++---
1 file changed, 46 insertions(+), 4 deletions(-)
diff --git a/patches/cl-static-library.patch b/patches/cl-static-library.patch
index 76091f3..fecce2f 100644
--- a/patches/cl-static-library.patch
+++ b/patches/cl-static-library.patch
@@ -1,6 +1,6 @@
--- ../orig/crypt32.vcxproj 2019-01-31 03:34:12.000000000 -0500
-+++ crypt32.vcxproj 2022-02-27 14:46:21.846524000 -0500
-@@ -32,30 +32,30 @@
++++ crypt32.vcxproj 2022-02-27 15:18:22.509174000 -0500
+@@ -32,30 +32,28 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -23,7 +23,7 @@
- <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
+- <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
@@ -32,10 +32,52 @@
- <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <WholeProgramOptimization>true</WholeProgramOptimization>
+- <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
+@@ -104,7 +102,7 @@
+ </PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <Optimization>Disabled</Optimization>
+- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CRYPT32_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <PreprocessorDefinitions>STATIC_LIB;WIN32;_DEBUG;_WINDOWS;_USRDLL;CRYPT32_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>false</ExceptionHandling>
+ <SmallerTypeCheck>false</SmallerTypeCheck>
+ <AdditionalIncludeDirectories>.\</AdditionalIncludeDirectories>
+@@ -126,7 +124,7 @@
+ </PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <Optimization>Disabled</Optimization>
+- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CRYPT32_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <PreprocessorDefinitions>STATIC_LIB;WIN32;_DEBUG;_WINDOWS;_USRDLL;CRYPT32_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>false</ExceptionHandling>
+ <SmallerTypeCheck>false</SmallerTypeCheck>
+ <AdditionalIncludeDirectories>.\</AdditionalIncludeDirectories>
+@@ -154,12 +152,11 @@
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CRYPT32_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <PreprocessorDefinitions>STATIC_LIB;WIN32;NDEBUG;_WINDOWS;_USRDLL;CRYPT32_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.\</AdditionalIncludeDirectories>
+ <StringPooling>true</StringPooling>
+ <ExceptionHandling>false</ExceptionHandling>
+ <ControlFlowGuard>Guard</ControlFlowGuard>
+- <WholeProgramOptimization>true</WholeProgramOptimization>
+ </ClCompile>
+ <Link>
+ <SubSystem>Windows</SubSystem>
+@@ -182,7 +179,7 @@
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CRYPT32_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
++ <PreprocessorDefinitions>STATIC_LIB;WIN32;NDEBUG;_WINDOWS;_USRDLL;CRYPT32_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>.\</AdditionalIncludeDirectories>
+ <ExceptionHandling>false</ExceptionHandling>
+ <StringPooling>true</StringPooling>
+@@ -607,4 +604,4 @@
--
GitLab