From 0d8d161eaf4c015a715cb2ec2d255abc39969e92 Mon Sep 17 00:00:00 2001 From: Julian Priestley Date: Mon, 12 Nov 2007 23:36:01 +0000 Subject: [PATCH] * Enable incremental linking for debug configurations in the MSVC projects files. This allows edit and continue to be used, and prevents a build warning about inconsistencies in the project files. * Convert line endings back to DOS in the MSVC project files, as MSVC silently replaces UNIX endings for project files. --- misc/msvc/cgame.vcproj | 4 ++-- misc/msvc/game.vcproj | 4 ++-- misc/msvc/q3_ui.vcproj | 4 ++-- misc/msvc/ui.vcproj | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/misc/msvc/cgame.vcproj b/misc/msvc/cgame.vcproj index f5cf7563..5270f095 100644 --- a/misc/msvc/cgame.vcproj +++ b/misc/msvc/cgame.vcproj @@ -168,7 +168,7 @@ Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib" OutputFile="$(OutDir)\cgamex86.dll" - LinkIncremental="1" + LinkIncremental="2" SuppressStartupBanner="true" ModuleDefinitionFile=".\cgame.def" GenerateDebugInformation="true" @@ -360,7 +360,7 @@ Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib" OutputFile="$(OutDir)\cgamex86.dll" - LinkIncremental="1" + LinkIncremental="2" SuppressStartupBanner="true" ModuleDefinitionFile=".\cgame.def" GenerateDebugInformation="true" diff --git a/misc/msvc/game.vcproj b/misc/msvc/game.vcproj index 0290a63c..667db7c1 100644 --- a/misc/msvc/game.vcproj +++ b/misc/msvc/game.vcproj @@ -72,7 +72,7 @@ Name="VCLinkerTool" AdditionalDependencies="winmm.lib" OutputFile="$(OutDir)\qagamex86.dll" - LinkIncremental="1" + LinkIncremental="2" SuppressStartupBanner="true" ModuleDefinitionFile=".\game.def" GenerateDebugInformation="true" @@ -168,7 +168,7 @@ Name="VCLinkerTool" AdditionalDependencies="winmm.lib" OutputFile="$(OutDir)\qagamex86.dll" - LinkIncremental="1" + LinkIncremental="2" SuppressStartupBanner="true" ModuleDefinitionFile=".\game.def" GenerateDebugInformation="true" diff --git a/misc/msvc/q3_ui.vcproj b/misc/msvc/q3_ui.vcproj index 93dcf301..f6717262 100644 --- a/misc/msvc/q3_ui.vcproj +++ b/misc/msvc/q3_ui.vcproj @@ -74,7 +74,7 @@ Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib" OutputFile="$(OutDir)\uix86_old.dll" - LinkIncremental="1" + LinkIncremental="2" SuppressStartupBanner="true" ModuleDefinitionFile="q3_ui.def" GenerateDebugInformation="true" @@ -357,7 +357,7 @@ Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib" OutputFile="$(OutDir)\uix86.dll" - LinkIncremental="1" + LinkIncremental="2" SuppressStartupBanner="true" ModuleDefinitionFile="q3_ui.def" GenerateDebugInformation="true" diff --git a/misc/msvc/ui.vcproj b/misc/msvc/ui.vcproj index 3c3a0ada..039dc369 100644 --- a/misc/msvc/ui.vcproj +++ b/misc/msvc/ui.vcproj @@ -170,7 +170,7 @@ Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib" OutputFile="$(OutDir)\uix86_new.dll" - LinkIncremental="1" + LinkIncremental="2" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)\ui.pdb" @@ -361,7 +361,7 @@ Name="VCLinkerTool" AdditionalDependencies="odbc32.lib odbccp32.lib" OutputFile="$(OutDir)\uix86.dll" - LinkIncremental="1" + LinkIncremental="2" SuppressStartupBanner="true" ModuleDefinitionFile=".\ui.def" GenerateDebugInformation="true"