Merge pull request #296 from g-maxime/patches

Update Visual Studio patches
MediaArea · Jun 20, 2024 · 046de82 · 046de82
2 parents 9882da9 + cdea252
commit 046de82
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/build_release/Diff/MediaInfoLib_MT.diff b/build_release/Diff/MediaInfoLib_MT.diff
@@ -97,18 +97,18 @@ diff --git a/Project/MSVC2019/ShellExtension/MediaInfoShellExt.vcxproj b/Project
 index cfa94c1..afb32c3 100644
 --- a/Project/MSVC2019/ShellExtension/MediaInfoShellExt.vcxproj
 +++ b/Project/MSVC2019/ShellExtension/MediaInfoShellExt.vcxproj
-@@ -157,6 +157,7 @@
-       <PrecompiledHeader>Use</PrecompiledHeader>
+@@ -156,6 +156,7 @@
        <MultiProcessorCompilation>true</MultiProcessorCompilation>
        <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+       <ControlFlowGuard>Guard</ControlFlowGuard>
 +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      </ClCompile>
      <ResourceCompile>
        <Culture>0x0409</Culture>
-@@ -187,6 +188,7 @@
-       <AdditionalIncludeDirectories>..\..\..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+@@ -188,6 +188,7 @@
        <PrecompiledHeader>Use</PrecompiledHeader>
        <MultiProcessorCompilation>true</MultiProcessorCompilation>
+       <ControlFlowGuard>Guard</ControlFlowGuard>
 +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      </ClCompile>
      <ResourceCompile>

diff --git a/build_release/Diff/zlib_MT.diff b/build_release/Diff/zlib_MT.diff
@@ -21,21 +21,21 @@
        <BufferSecurityCheck>false</BufferSecurityCheck>
        <FunctionLevelLinking>true</FunctionLevelLinking>
        <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-@@ -246,7 +246,7 @@
+@@ -247,7 +247,7 @@
        <StringPooling>true</StringPooling>
        <ExceptionHandling>
        </ExceptionHandling>
 -      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-       <BufferSecurityCheck>false</BufferSecurityCheck>
+       <BufferSecurityCheck>true</BufferSecurityCheck>
        <FunctionLevelLinking>true</FunctionLevelLinking>
        <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
-@@ -279,7 +279,7 @@
+@@ -280,7 +280,7 @@
        <StringPooling>true</StringPooling>
        <ExceptionHandling>
        </ExceptionHandling>
 -      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-       <BufferSecurityCheck>false</BufferSecurityCheck>
+       <BufferSecurityCheck>true</BufferSecurityCheck>
        <FunctionLevelLinking>true</FunctionLevelLinking>
        <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>