Some more overlapping patch massaging

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>

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>