summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2006-11-21 13:03:06 +0000
committerDarkvater <darkvater@openttd.org>2006-11-21 13:03:06 +0000
commit5471c1c50f623e35e6808d41df71109cf9afd300 (patch)
treeda7830fc1f09698727ad299f786015a568d3392a
parentba9f22cee6b0d4a4ba0b5740e2d532c41524756d (diff)
downloadopenttd-5471c1c50f623e35e6808d41df71109cf9afd300.tar.xz
(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.
-rw-r--r--openttd.vcproj4
-rw-r--r--openttd_vs80.vcproj4
-rw-r--r--stdafx.h1
3 files changed, 4 insertions, 5 deletions
diff --git a/openttd.vcproj b/openttd.vcproj
index 4399b9f35..d42356e2b 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 4c5ebbae3..b581932d8 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 e22a2494b..00823e188 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 <malloc.h> // alloca()