(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.
This commit is contained in:
		@@ -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"
 | 
			
		||||
 
 | 
			
		||||
@@ -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"
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								stdafx.h
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								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()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user