ShellExtension.vcxproj: Add /Zc:threadSafeInit- compiler option

diff --git a/ShellExtension/ShellExtension/ShellExtension.vcxproj b/ShellExtension/ShellExtension/ShellExtension.vcxproj
index 5350442..0594cac 100644 (file)
--- a/ShellExtension/ShellExtension/ShellExtension.vcxproj
+++ b/ShellExtension/ShellExtension/ShellExtension.vcxproj
@@ -157,6 +157,7 @@
       <CompileAs>Default</CompileAs>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
       <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>\r
@@ -197,6 +198,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>Default</CompileAs>\r
       <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>\r
@@ -236,6 +238,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
       <CompileAs>Default</CompileAs>\r
       <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>\r
@@ -278,6 +281,7 @@
       <CompileAs>Default</CompileAs>\r
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>\r
       <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>\r
@@ -320,6 +324,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <CompileAs>Default</CompileAs>\r
       <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>\r
@@ -361,6 +366,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <CompileAs>Default</CompileAs>\r
       <LanguageStandard>stdcpp17</LanguageStandard>\r
+      <AdditionalOptions>/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>\r
     </ClCompile>\r
     <Link>\r
       <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>\r
@@ -467,4 +473,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>\r
+</Project>
\ No newline at end of file

diff --git a/ShellExtension/ShellExtension/ShellExtension.vcxproj.filters b/ShellExtension/ShellExtension/ShellExtension.vcxproj.filters
index c1d4adc..317320a 100644 (file)
--- a/ShellExtension/ShellExtension/ShellExtension.vcxproj.filters
+++ b/ShellExtension/ShellExtension/ShellExtension.vcxproj.filters
@@ -13,25 +13,31 @@
       <UniqueIdentifier>{39d571c9-dfaf-4994-a7f5-7f34c3d5d192}</UniqueIdentifier>
       <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
     </Filter>
+    <Filter Include="Common">
+      <UniqueIdentifier>{ed82f8a2-602b-4ce5-8653-f324b645f755}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="RegKey.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="ShellExtension.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="StdAfx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="UnicodeString.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="WinMergeShell.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="LanguageSelect.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\Common\LanguageSelect.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\RegKey.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\UnicodeString.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\WinMergeContextMenu.cpp">
+      <Filter>Common</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -45,23 +51,26 @@
     </Midl>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="RegKey.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="StdAfx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="UnicodeString.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="WinMergeShell.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="LanguageSelect.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\Common\LanguageSelect.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\RegKey.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\UnicodeString.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Common\WinMergeContextMenu.h">
+      <Filter>Common</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -78,10 +87,10 @@
     </CustomBuildStep>
   </ItemGroup>
   <ItemGroup>
-    <Image Include="WinMerge.ico">
+    <Image Include="../Resrouces/WinMerge.ico">
       <Filter>Resource Files</Filter>
     </Image>
-    <Image Include="WinMergeDir.ico">
+    <Image Include="../Resrouces/WinMergeDir.ico">
       <Filter>Resource Files</Filter>
     </Image>
   </ItemGroup>