diff options
| author | Steve Huston <shuston@riverace.com> | 2006-02-21 23:16:52 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2006-02-21 23:16:52 +0000 |
| commit | 65bfad9e410ebcc38e68eef09541a41543b3abd0 (patch) | |
| tree | 67ea33cdee8390b715542dae4ec379bb6c6a8231 | |
| parent | 3e3a693bcb6b75587ccec22a3d49e5d678941a15 (diff) | |
| download | MPC-65bfad9e410ebcc38e68eef09541a41543b3abd0.tar.gz | |
ChangeLogTag:Tue Feb 21 18:14:21 2006 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | templates/vc8.mpd | 4 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Tue Feb 21 18:14:21 2006 Steve Huston <shuston@riverace.com> + + * templates/vc8.mpd: Put .lib files with .dll files in $(OutDir). + When emitting AdditionalLibraryDirectories and there is a specified + output_subdir, append output_subdir to each libpath, then the + plain libpath. This picks up output_subdir specs and hopefully + won't hurt anything for libpaths that don't have the subdirs. + Thu Feb 16 21:36:37 UTC 2006 Wallace Zhang <zhangw@ociweb.com> * highlight_template.pl: @@ -29,6 +37,7 @@ Thu Feb 16 19:53:13 UTC 2006 Chad Elliott <elliott_c@ociweb.com> Greatly simplified this template by removing many little foreach's and enclose most of the template in two big foreach's. +>>>>>>> 1.380 Wed Feb 15 19:41:59 2006 J.T. Conklin <jtc@acorntoolworks.com> * templates/automake.mpd: diff --git a/templates/vc8.mpd b/templates/vc8.mpd index 000fbbba..e62b1d57 100644 --- a/templates/vc8.mpd +++ b/templates/vc8.mpd @@ -297,7 +297,7 @@ <%endif%> LinkIncremental="<%LinkIncremental("2")%>" SuppressStartupBanner="<%SuppressStartupBanner("true")%>" - AdditionalLibraryDirectories="<%foreach(libpaths)%><%libpath%><%fornotlast(";")%><%endfor%>" + AdditionalLibraryDirectories="<%foreach(libpaths)%><%if(output_subdir)%><%libpath%>\<%output_subdir%>;<%endif%><%libpath%><%fornotlast(";")%><%endfor%>" <%if(ShowProgress)%> ShowProgress="<%ShowProgress%>" <%endif%> @@ -423,7 +423,7 @@ TurnOffAssemblyGeneration="<%TurnOffAssemblyGeneration%>" <%endif%> <%if(type_is_dynamic && sharedname)%> - ImportLibrary="<%libout%>\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>" + ImportLibrary="$(OutDir)\<%libname_prefix%><%sharedname%><%if(use_lib_modifier)%><%lib_modifier%><%endif%><%lib_ext%>" <%endif%> <%if(SupportUnloadOfDelayLoadedDLL)%> SupportUnloadOfDelayLoadedDLL="<%SupportUnloadOfDelayLoadedDLL%>" |