From 4452249442616754f2e941a5f6a1b5e05949cf7e Mon Sep 17 00:00:00 2001
From: Stephen Hurd <deuce@synchro.net>
Date: Sun, 27 Feb 2022 15:25:52 -0500
Subject: [PATCH] Some more overlapping patch massaging
---
patches/cl-static-library.patch | 7 +------
patches/cl-vcxproj.patch | 4 ++--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/patches/cl-static-library.patch b/patches/cl-static-library.patch
index fecce2f..a247daa 100644
--- a/patches/cl-static-library.patch
+++ b/patches/cl-static-library.patch
@@ -57,7 +57,7 @@
<ExceptionHandling>false</ExceptionHandling>
<SmallerTypeCheck>false</SmallerTypeCheck>
<AdditionalIncludeDirectories>.\</AdditionalIncludeDirectories>
-@@ -154,12 +152,11 @@
+@@ -154,7 +152,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -66,11 +66,6 @@
<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>
diff --git a/patches/cl-vcxproj.patch b/patches/cl-vcxproj.patch
index 43066f1..a1a3465 100644
--- a/patches/cl-vcxproj.patch
+++ b/patches/cl-vcxproj.patch
@@ -26,10 +26,10 @@
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
-@@ -160,6 +165,8 @@
+@@ -160,6 +165,7 @@
<ExceptionHandling>false</ExceptionHandling>
<ControlFlowGuard>Guard</ControlFlowGuard>
- <WholeProgramOptimization>true</WholeProgramOptimization>
+- <WholeProgramOptimization>true</WholeProgramOptimization>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
</ClCompile>
--
GitLab