From 26a58e9d484a9fbbd000dff3e49e570f2bafd417 Mon Sep 17 00:00:00 2001
From: mirh <mirh@users.noreply.github.com>
Date: Fri, 1 Jul 2016 17:24:27 +0200
Subject: [PATCH] Don't use thread-safe statics with MSVS when targeting XP

Disable thread-safe initialization for static local variables in Visual Studio
2015 when XP toolset is used as this results in crashes when using DLLs under
XP, see #13116.

Closes #17403.
---
 build/msw/wx_setup.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/msw/wx_setup.props b/build/msw/wx_setup.props
index 0cee81fb4b..c15fb84ffa 100644
--- a/build/msw/wx_setup.props
+++ b/build/msw/wx_setup.props
@@ -70,6 +70,9 @@
     <wxBaseLibNamePrefix>wxbase$(wxShortVersionString)$(wxSuffix)</wxBaseLibNamePrefix>
   </PropertyGroup>
   <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalOptions Condition="'$(PlatformToolset)' == 'v140_xp'">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;shell32.lib;shlwapi.lib;ole32.lib;oleaut32.lib;uuid.lib;advapi32.lib;version.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;wininet.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>