summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2006-03-22 20:41:48 +0000
committerDarkvater <darkvater@openttd.org>2006-03-22 20:41:48 +0000
commitcc6d563eb61ea0f707b776261cccf0b190435b07 (patch)
tree9a24d31417a416a67a6cb48b3d918c49c5049395
parent337cdcc31fca98adcdcc21b729deb44c6974ed05 (diff)
downloadopenttd-cc6d563eb61ea0f707b776261cccf0b190435b07.tar.xz
(svn r4030) Darkvater * r4030 /trunk/ (openttd.dsp openttd.vcproj): - [win32] Change compiler settings to use the multithreaded CRT. This prevents certain crashes on multi-threaded machines. (thx DmitryKo and KUDr)
-rw-r--r--openttd.dsp2
-rw-r--r--openttd.vcproj4
2 files changed, 3 insertions, 3 deletions
diff --git a/openttd.dsp b/openttd.dsp
index 0754b0169..7ab85bc40 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 f903f1703..b7e36f79c 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"