diff options
| author | megamage <none@none> | 2009-03-09 17:53:33 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-09 17:53:33 -0600 |
| commit | f4e473c877c162088ed566ea12e9953327a52f92 (patch) | |
| tree | 7c1652de3bbdd0d5675a8f2e853499be285e360b /win/VC71 | |
| parent | f9aaf5bffb2686fda61016edc920a5a54845ea43 (diff) | |
[7423] Disable incremental limking for binaries in debug mode. Author: VladimirMangos
Anyway it always fail and back to non-incremental way.
--HG--
branch : trunk
Diffstat (limited to 'win/VC71')
| -rw-r--r-- | win/VC71/ACE_vc71.vcproj | 2 | ||||
| -rw-r--r-- | win/VC71/realmd.vcproj | 12 |
2 files changed, 3 insertions, 11 deletions
diff --git a/win/VC71/ACE_vc71.vcproj b/win/VC71/ACE_vc71.vcproj index 1b991d8b429..e54a8de7d62 100644 --- a/win/VC71/ACE_vc71.vcproj +++ b/win/VC71/ACE_vc71.vcproj @@ -45,7 +45,7 @@ Name="VCLinkerTool" AdditionalDependencies="" OutputFile="$(OutDir)\ACEd.dll" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="" GenerateDebugInformation="TRUE" diff --git a/win/VC71/realmd.vcproj b/win/VC71/realmd.vcproj index f8ae9d10542..10fabaf899c 100644 --- a/win/VC71/realmd.vcproj +++ b/win/VC71/realmd.vcproj @@ -24,11 +24,7 @@ Name="VCCLCompilerTool" InlineFunctionExpansion="1" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" -<<<<<<< HEAD:win/VC71/realmd.vcproj - PreprocessorDefinitions="VERSION="0.12.0-SVN",WIN32,NDEBUG,_CONSOLE" -======= PreprocessorDefinitions="VERSION="0.13.0-DEV",WIN32,NDEBUG,_CONSOLE" ->>>>>>> upstream/master:win/VC71/realmd.vcproj StringPooling="TRUE" RuntimeLibrary="2" EnableFunctionLevelLinking="TRUE" @@ -96,11 +92,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\dep\include;..\..\src\framework;..\..\src\shared;..\..\src\realmd;..\..\dep\ACE_wrappers" -<<<<<<< HEAD:win/VC71/realmd.vcproj - PreprocessorDefinitions="VERSION="0.12.0-SVN";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE" -======= PreprocessorDefinitions="VERSION="0.13.0-DEV";WIN32;_DEBUG;MANGOS_DEBUG;_CONSOLE" ->>>>>>> upstream/master:win/VC71/realmd.vcproj IgnoreStandardIncludePath="FALSE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -119,9 +111,9 @@ <Tool Name="VCLinkerTool" AdditionalOptions="/MACHINE:I386" - AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib MSVCPRTD.LIB msvcrtd.lib" + AdditionalDependencies="zthread.lib libmySQL.lib libeay32.lib ws2_32.lib winmm.lib odbc32.lib odbccp32.lib advapi32.lib dbghelp.lib" OutputFile="..\..\bin\$(PlatformName)_$(ConfigurationName)\TrinityRealm.exe" - LinkIncremental="2" + LinkIncremental="1" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories=""..\..\dep\lib\$(PlatformName)_$(ConfigurationName)";".\zthread__$(PlatformName)_$(ConfigurationName)"" GenerateDebugInformation="TRUE" |