From b8cf1f7504539732036a2d6ed486d1a10aa62e82 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Tue, 21 Nov 2006 13:03:06 +0000 Subject: [PATCH] (svn r7226) -Fix (r7200): [win32] Don't ask my why but I told the linker to ignore the multithreaded library in for VS2005, resulting in unlinkable code for Release builds. --- openttd.vcproj | 4 ++-- openttd_vs80.vcproj | 4 ++-- stdafx.h | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/openttd.vcproj b/openttd.vcproj index 4399b9f352..d42356e2b3 100644 --- a/openttd.vcproj +++ b/openttd.vcproj @@ -58,7 +58,7 @@ OutputFile=".\Release/openttd.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="LIBC.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Release/openttd.pdb" SubSystem="2" @@ -125,7 +125,7 @@ OutputFile=".\Debug/openttd.exe" LinkIncremental="0" SuppressStartupBanner="TRUE" - IgnoreDefaultLibraryNames="LIBC.lib" + IgnoreDefaultLibraryNames="LIBCMT.lib" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\Debug/openttd.pdb" SubSystem="2" diff --git a/openttd_vs80.vcproj b/openttd_vs80.vcproj index 4c5ebbae3b..b581932d8b 100644 --- a/openttd_vs80.vcproj +++ b/openttd_vs80.vcproj @@ -98,7 +98,7 @@ OutputFile=".\$(ConfigurationName)\openttd.exe" LinkIncremental="1" SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="LIBC.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb" SubSystem="2" @@ -310,7 +310,7 @@ OutputFile=".\$(ConfigurationName)\openttd.exe" LinkIncremental="0" SuppressStartupBanner="true" - IgnoreDefaultLibraryNames="LIBC.lib" + IgnoreDefaultLibraryNames="LIBCMT.lib" GenerateDebugInformation="true" ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb" SubSystem="2" diff --git a/stdafx.h b/stdafx.h index e22a2494bf..00823e1889 100644 --- a/stdafx.h +++ b/stdafx.h @@ -106,7 +106,6 @@ # if _MSC_VER >= 1400 // MSVC 2005 safety checks # pragma warning(disable: 4996) // 'strdup' was declared deprecated # define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions -# pragma comment(linker, "/NODEFAULTLIB:LIBCMT.LIB") // allow linking to non-recompiled libs # endif /* _MSC_VER >= 1400 */ # include // alloca()