diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2005-12-27 03:03:40 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2005-12-27 03:03:40 +0000 |
| commit | b76844b0441a4ae9be2844bd731c4b8b17951fc2 (patch) | |
| tree | 9d5faaa9c3cee9ee31421086b304ad6ed5fde709 | |
| parent | 7d9a7dd3289eeee70409fc6d7d032be1538c65ee (diff) | |
| download | MPC-b76844b0441a4ae9be2844bd731c4b8b17951fc2.tar.gz | |
ChangeLogTag: Mon Dec 26 21:02:36 2005 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | templates/vc7.mpd | 2 | ||||
| -rw-r--r-- | templates/vc8.mpd | 2 |
3 files changed, 17 insertions, 9 deletions
@@ -1,13 +1,21 @@ +Mon Dec 26 21:02:36 2005 Chad Elliott <elliott_c@ociweb.com> + + * templates/vc7.mpd: + * templates/vc8.mpd: + + Set the run-time library to a static version if either template + variables type_is_static or need_staticflags are set. + Thu Dec 22 13:56:14 2005 J.T. Conklin <jtc@acorntoolworks.com> - * modules/AutomakeProjectCreator.pm: + * modules/AutomakeProjectCreator.pm: - Disable code that prefixed include paths with "$(srcdir)/". In - some cases an include path should be relative to the source dir, - in others it should be relative to the build dir, and sometimes - it should be relative to both. Since it is impossible to guess - which is the correct choice, require the *.mpc file to specify - it correctly. + Disable code that prefixed include paths with "$(srcdir)/". In + some cases an include path should be relative to the source dir, + in others it should be relative to the build dir, and sometimes + it should be relative to both. Since it is impossible to guess + which is the correct choice, require the *.mpc file to specify + it correctly. Thu Dec 22 15:17:30 2005 Chad Elliott <elliott_c@ociweb.com> diff --git a/templates/vc7.mpd b/templates/vc7.mpd index c3bba7f4..970b9dd3 100644 --- a/templates/vc7.mpd +++ b/templates/vc7.mpd @@ -52,7 +52,7 @@ <%if(runtime_library)%> RuntimeLibrary="<%runtime_library%>" <%else%> - RuntimeLibrary="<%if(type_is_static)%><%if(!optimize)%>1<%else%>0<%endif%><%else%><%if(!optimize)%>3<%else%>2<%endif%><%endif%>" + RuntimeLibrary="<%if(type_is_static || need_staticflags)%><%if(!optimize)%>1<%else%>0<%endif%><%else%><%if(!optimize)%>3<%else%>2<%endif%><%endif%>" <%endif%> BufferSecurityCheck="<%BufferSecurityCheck("TRUE")%>" EnableFunctionLevelLinking="<%EnableFunctionLevelLinking("TRUE")%>" diff --git a/templates/vc8.mpd b/templates/vc8.mpd index 8ffbf21e..bf3f0ea0 100644 --- a/templates/vc8.mpd +++ b/templates/vc8.mpd @@ -118,7 +118,7 @@ <%if(runtime_library)%> RuntimeLibrary="<%runtime_library%>" <%else%> - RuntimeLibrary="<%if(type_is_static)%><%if(!optimize)%>1<%else%>0<%endif%><%else%><%if(!optimize)%>3<%else%>2<%endif%><%endif%>" + RuntimeLibrary="<%if(type_is_static || need_staticflags)%><%if(!optimize)%>1<%else%>0<%endif%><%else%><%if(!optimize)%>3<%else%>2<%endif%><%endif%>" <%endif%> <%if(StructMemberAlignment)%> StructMemberAlignment="<%StructMemberAlignment%>" |