diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2005-08-29 13:53:38 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2005-08-29 13:53:38 +0000 |
| commit | e435ebaeab128ecdb65e3346e9f5e0989067195c (patch) | |
| tree | 247aeb7150cf646740fdfa57eea435b0e946ebb9 | |
| parent | bb612f1a0ad7d1ef971f7e53a586792a52216747 (diff) | |
| download | MPC-e435ebaeab128ecdb65e3346e9f5e0989067195c.tar.gz | |
ChangeLogTag: Mon Aug 29 08:52:15 2005 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 20 | ||||
| -rw-r--r-- | templates/vc7.mpd | 2 | ||||
| -rw-r--r-- | templates/vc7dll.mpt | 2 | ||||
| -rw-r--r-- | templates/vc7exe.mpt | 2 |
4 files changed, 21 insertions, 5 deletions
@@ -1,3 +1,15 @@ +Mon Aug 29 08:52:15 2005 Chad Elliott <elliott_c@ociweb.com> + + * templates/vc7.mpd: + + Enabled incremental linking as the default. + + * templates/vc7dll.mpt: + * templates/vc7exe.mpt: + + Disable incremental linking in release mode as was done in + Justin's change on Fri Aug 26 13:46:47 2005. + Mon Aug 29 12:41:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * templates/nmakedll.mpt: @@ -14,16 +26,16 @@ Fri Aug 26 14:32:48 2005 Justin Michel <michel_j@ociweb.com> * clone_build_tree.pl: - Updated to prevent cloning of .suo files, which are used to store - solution settings for VC++ 7+. + Updated to prevent cloning of .suo files, which are used to store + solution settings for VC++ 7+. Fri Aug 26 13:46:47 2005 Justin Michel <michel_j@ociweb.com> * templates/vc7libexe.mpt: * templates/vc8libexe.mpt: - It is invalid to enable incremental linking on release builds, because - we also enabled comdat folding and reference optimization. + It is invalid to enable incremental linking on release builds, + because we also enabled comdat folding and reference optimization. Mon Aug 22 11:57:03 2005 Chad Elliott <elliott_c@ociweb.com> diff --git a/templates/vc7.mpd b/templates/vc7.mpd index 5b774c35..e94d01af 100644 --- a/templates/vc7.mpd +++ b/templates/vc7.mpd @@ -100,7 +100,7 @@ <%if(win_version)%> Version="<%win_version%>" <%endif%> - LinkIncremental="<%LinkIncremental("1")%>" + LinkIncremental="<%LinkIncremental("2")%>" SuppressStartupBanner="TRUE" AdditionalLibraryDirectories="<%foreach(libpaths)%><%libpath%><%fornotlast(";")%><%endfor%>" <%if(ignore_default_library_names)%> diff --git a/templates/vc7dll.mpt b/templates/vc7dll.mpt index d877e775..9da27daf 100644 --- a/templates/vc7dll.mpt +++ b/templates/vc7dll.mpt @@ -9,6 +9,7 @@ common_defines = WIN32 _WINDOWS use_lib_modifier = 1 Release { + LinkIncremental = 1 optimize = 3 defines = NDEBUG output_dir = Release @@ -28,6 +29,7 @@ Debug { } MFC Release { + LinkIncremental = 1 optimize = 3 defines = NDEBUG output_dir = MFC_Release diff --git a/templates/vc7exe.mpt b/templates/vc7exe.mpt index cde8655f..6c4482eb 100644 --- a/templates/vc7exe.mpt +++ b/templates/vc7exe.mpt @@ -11,6 +11,7 @@ subsystem = 1 use_exe_modifier = Release { + LinkIncremental = 1 optimize = 3 defines = NDEBUG output_dir = Release @@ -30,6 +31,7 @@ Debug { } MFC Release { + LinkIncremental = 1 optimize = 3 common_defines = WIN32 _WINDOWS defines = NDEBUG _AFXDLL |