dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r7226) -Fix (r7200): [win32] Don't ask my why but I told the linker to ignore the multithreaded

Browse Source 
library in for VS2005, resulting in unlinkable code for Release builds.
This commit is contained in:
Darkvater
2006-11-21 13:03:06 +00:00
parent 53b02577b9
commit b8cf1f7504
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openttd.vcproj
View File

@@ -58,7 +58,7 @@
OutputFile=".\Release/openttd.exe" OutputFile=".\Release/openttd.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="LIBC.lib" IgnoreDefaultLibraryNames=""
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Release/openttd.pdb" ProgramDatabaseFile=".\Release/openttd.pdb"
SubSystem="2" SubSystem="2"
@@ -125,7 +125,7 @@
OutputFile=".\Debug/openttd.exe" OutputFile=".\Debug/openttd.exe"
LinkIncremental="0" LinkIncremental="0"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="LIBC.lib" IgnoreDefaultLibraryNames="LIBCMT.lib"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/openttd.pdb" ProgramDatabaseFile=".\Debug/openttd.pdb"
SubSystem="2" SubSystem="2"

4
openttd_vs80.vcproj
View File

@@ -98,7 +98,7 @@
OutputFile=".\$(ConfigurationName)\openttd.exe" OutputFile=".\$(ConfigurationName)\openttd.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="LIBC.lib" IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb" ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb"
SubSystem="2" SubSystem="2"
@@ -310,7 +310,7 @@
OutputFile=".\$(ConfigurationName)\openttd.exe" OutputFile=".\$(ConfigurationName)\openttd.exe"
LinkIncremental="0" LinkIncremental="0"
SuppressStartupBanner="true" SuppressStartupBanner="true"
IgnoreDefaultLibraryNames="LIBC.lib" IgnoreDefaultLibraryNames="LIBCMT.lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb" ProgramDatabaseFile=".\$(ConfigurationName)\openttd.pdb"
SubSystem="2" SubSystem="2"

1
stdafx.h
View File

@@ -106,7 +106,6 @@
# if _MSC_VER >= 1400 // MSVC 2005 safety checks # if _MSC_VER >= 1400 // MSVC 2005 safety checks
# pragma warning(disable: 4996) // 'strdup' was declared deprecated # pragma warning(disable: 4996) // 'strdup' was declared deprecated
# define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions # 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 */ # endif /* _MSC_VER >= 1400 */
# include <malloc.h> // alloca() # include <malloc.h> // alloca()