From ed7df6e2bfc90fda93fae648006b0545e96f78d4 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Wed, 22 Mar 2006 20:46:07 +0000 Subject: [PATCH] (svn r4031) - Backport from trunk (r4030): - [win32] Change compiler settings to use the multithreaded CRT. This prevents certain crashes on multi-threaded machines. --- openttd.dsp | 2 +- openttd.vcproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openttd.dsp b/openttd.dsp index 898bbd6f4f..e030677486 100644 --- a/openttd.dsp +++ b/openttd.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /Gr /Zp4 /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /FAcs /FR /Yu"stdafx.h" /J /FD /c +# ADD CPP /nologo /Gr /Zp4 /MT /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /FAcs /FR /Yu"stdafx.h" /J /FD /c # SUBTRACT CPP /WX /Ot # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" diff --git a/openttd.vcproj b/openttd.vcproj index 4420579429..6f030d431b 100644 --- a/openttd.vcproj +++ b/openttd.vcproj @@ -31,7 +31,7 @@ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;ENABLE_NETWORK" StringPooling="TRUE" ExceptionHandling="FALSE" - RuntimeLibrary="4" + RuntimeLibrary="0" StructMemberAlignment="3" BufferSecurityCheck="FALSE" EnableFunctionLevelLinking="TRUE" @@ -102,7 +102,7 @@ Optimization="0" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;ENABLE_NETWORK" BasicRuntimeChecks="3" - RuntimeLibrary="5" + RuntimeLibrary="1" UsePrecompiledHeader="2" PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile=".\Debug/openttd.pch"