Mercurial > hg > openttd
changeset 5138:ba7a8fa2da0a draft
(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.
| author | Darkvater <Darkvater@openttd.org> |
|---|---|
| date | Tue, 21 Nov 2006 13:03:06 +0000 |
| parents | c63c0993f8c8 |
| children | 2f3c093f2ff1 |
| files | openttd.vcproj openttd_vs80.vcproj stdafx.h |
| diffstat | 3 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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"
--- 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"
--- 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 <malloc.h> // alloca()