From 402dd7de769270d89ab1327d86fdc47506b261f2 Mon Sep 17 00:00:00 2001 From: huangming Date: Thu, 22 Jan 2004 20:57:54 +0000 Subject: Merged From Trunk 01-22-04 --- templates/va4icc.mpd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/va4icc.mpd b/templates/va4icc.mpd index 591c91d4..60c85607 100644 --- a/templates/va4icc.mpd +++ b/templates/va4icc.mpd @@ -49,7 +49,7 @@ option <%foreach(includes)%> incl(searchPath, '<%include%>'), <%endfor%> -<%if(sharedname)%> +<%if(sharedname || staticname)%> link(exportAll), <%endif%> link(linkwithsharedlib), @@ -60,11 +60,11 @@ option link(debug) { if $__TOS_WIN__ { - target type ( <%if(type_is_dynamic)%>shr<%endif%><%if(type_is_static)%>lib<%endif%><%if(type_is_binary)%>exe<%endif%> ) '<%if(type_is_dynamic)%>shr.o<%endif%><%if(type_is_static)%>lib<%sharedname%>.a<%endif%><%if(type_is_binary)%><%exename%><%endif%>' + target type ( <%if(type_is_dynamic)%>shr<%endif%><%if(type_is_static)%>lib<%endif%><%if(type_is_binary)%>exe<%endif%> ) '<%if(type_is_dynamic)%>shr.o<%endif%><%if(type_is_static)%>lib<%staticname%>.a<%endif%><%if(type_is_binary)%><%exename%><%endif%>' { option macros(global) { -<%if(sharedname)%> +<%if(sharedname || staticname)%> source type(hpp) 'wchar.h' source type(hpp) 'wcstr.h' <%endif%> @@ -103,7 +103,7 @@ option } } if $__TOS_AIX__ { - target type ( <%if(type_is_dynamic)%>shr<%endif%><%if(type_is_static)%>lib<%endif%><%if(type_is_binary)%>exe<%endif%> ) '<%if(type_is_dynamic)%>shr.o<%endif%><%if(type_is_static)%>lib<%sharedname%>.a<%endif%><%if(type_is_binary)%><%exename%><%endif%>' + target type ( <%if(type_is_dynamic)%>shr<%endif%><%if(type_is_static)%>lib<%endif%><%if(type_is_binary)%>exe<%endif%> ) '<%if(type_is_dynamic)%>shr.o<%endif%><%if(type_is_static)%>lib<%staticname%>.a<%endif%><%if(type_is_binary)%><%exename%><%endif%>' { run after sources("shr.o") targets ("lib<%sharedname%>.a") "ar -r -u lib<%sharedname%>.a shr.o", "rm -rf shr.o" run cleanup "rm -rf lib<%sharedname%>.a shr.o" -- cgit v1.2.1