diff options
author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-10-31 13:42:25 +0000 |
---|---|---|
committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-10-31 13:42:25 +0000 |
commit | da99effcf978b0f8b7619c7e47774b596ec6c1eb (patch) | |
tree | e45f766cd0cc6f3f8796b2d95f6a19ca6f378046 | |
parent | 13932569225540750276d0faa77e15ab9a72bca7 (diff) | |
download | MPC-da99effcf978b0f8b7619c7e47774b596ec6c1eb.tar.gz |
ChangeLogTag: Fri Oct 31 07:38:40 2003 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r-- | templates/automake.mpd | 24 | ||||
-rw-r--r-- | templates/em3.mpd | 2 | ||||
-rw-r--r-- | templates/em3vcp.mpd | 2 | ||||
-rw-r--r-- | templates/nmake.mpd | 4 | ||||
-rw-r--r-- | templates/va4icc.mpd | 8 | ||||
-rw-r--r-- | templates/vc6.mpd | 2 | ||||
-rw-r--r-- | templates/vc6dsp.mpd | 2 | ||||
-rw-r--r-- | templates/vc7.mpd | 9 | ||||
-rw-r--r-- | templates/vc7dll.mpt | 12 |
9 files changed, 37 insertions, 28 deletions
diff --git a/templates/automake.mpd b/templates/automake.mpd index 78c4c3f6..55a02d4c 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -41,7 +41,7 @@ noinst_HEADERS = \ <%else%> <%if(grouped_source_files)%> <%foreach(grouped_source_files)%> -lib<%sharedname%>_<%uc(grouped_source_file)%>_la_SOURCES = \ +lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_<%uc(grouped_source_file)%>_la_SOURCES = \ <%foreach(grouped_source_file->files)%> <%grouped_source_file->file%><%fornotlast(" \\")%> <%endfor%> @@ -49,39 +49,39 @@ lib<%sharedname%>_<%uc(grouped_source_file)%>_la_SOURCES = \ <%endfor%> <%foreach(grouped_source_files)%> if BUILD_<%uc(grouped_source_file)%>_FILES -LIB<%sharedname%>_<%uc(grouped_source_file)%> = lib<%sharedname%>_<%grouped_source_file%>.la +LIB<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_<%uc(grouped_source_file)%> = lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_<%grouped_source_file%>.la else -LIB<%sharedname%>_<%uc(grouped_source_file)%> = +LIB<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_<%uc(grouped_source_file)%> = endif <%endfor%> lib_LTLIBRARIES = \ - $(LIB<%sharedname%>) \ + $(LIB<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>) \ <%foreach(grouped_source_files)%> - $(LIB<%sharedname%>_<%uc(grouped_source_file)%>)<%fornotlast(" \\")%> + $(LIB<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_<%uc(grouped_source_file)%>)<%fornotlast(" \\")%> <%endfor%> -lib<%sharedname%>_la_SOURCES = \ +lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_SOURCES = \ <%foreach(grouped_source_files)%> - $(lib<%sharedname%>_<%uc(grouped_source_file)%>_la_SOURCES)<%fornotlast(" \\")%> + $(lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_<%uc(grouped_source_file)%>_la_SOURCES)<%fornotlast(" \\")%> <%endfor%> <%foreach(grouped_source_files)%> -lib<%sharedname%>_<%uc(grouped_source_file)%>_la_SOURCES = \ +lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_<%uc(grouped_source_file)%>_la_SOURCES = \ <%foreach(grouped_source_file->files)%> <%grouped_source_file->file%><%fornotlast(" \\")%> <%endfor%> <%endfor%> -lib<%sharedname%>_la_LDFLAGS = $(X_LIBS) \ +lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LDFLAGS = $(X_LIBS) \ -version-info <%if(tao)%>@TAO_CURRENT@:@TAO_REVISION@:@TAO_AGE@<%else%>@ACE_CURRENT@:@ACE_REVISION@:@ACE_AGE@<%endif%> -lib<%sharedname%>_la_LIBADD = $(X_PRE_LIBS) $(<%sharedname%>_XLIBS) $(X_EXTRA_LIBS) +lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LIBADD = $(X_PRE_LIBS) $(<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_XLIBS) $(X_EXTRA_LIBS) <%else%> -lib_LTLIBRARIES = lib<%sharedname%>.la +lib_LTLIBRARIES = lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.la -lib<%sharedname%>_la_SOURCES = \ +lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_SOURCES = \ <%foreach(source_files)%> <%source_file%><%fornotlast(" \\")%> <%endfor%> diff --git a/templates/em3.mpd b/templates/em3.mpd index 90aa54fd..511a0b4a 100644 --- a/templates/em3.mpd +++ b/templates/em3.mpd @@ -66,7 +66,7 @@ CPP=<%cpp("cl.exe")%> # SUBTRACT CPP <%compile_flags_removed%> <%endif%> BSC32=bscmake.exe -# ADD BSC32 /nologo <%if(sharedname)%>/o"<%libout%>\<%sharedname%>.bsc"<%endif%> +# ADD BSC32 /nologo <%if(sharedname || staticname)%>/o"<%libout%>\<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.bsc"<%endif%> <%if(type_is_binary)%> LINK32=link.exe # ADD LINK32 <%systemlibs("winsock.lib commctrl.lib coredll.lib iphlpapi.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" <%stack%><%if(type_is_dynamic)%> /entry:"_DllMainCRTStartup"<%endif%> /nodefaultlib:"$(CENoDefaultLib)" /version:<%version("1.0")%> /subsystem:$(CESubsystem) /align:"<%align("4096")%>"<%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%>.pdb"<%endif%><%endif%><%endif%> <%if(type_is_dynamic)%> /dll<%endif%> <%if(use_debug_libraries)%>/debug<%endif%> /machine:<%machine%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%>.exe<%endif%>" diff --git a/templates/em3vcp.mpd b/templates/em3vcp.mpd index 90aa54fd..511a0b4a 100644 --- a/templates/em3vcp.mpd +++ b/templates/em3vcp.mpd @@ -66,7 +66,7 @@ CPP=<%cpp("cl.exe")%> # SUBTRACT CPP <%compile_flags_removed%> <%endif%> BSC32=bscmake.exe -# ADD BSC32 /nologo <%if(sharedname)%>/o"<%libout%>\<%sharedname%>.bsc"<%endif%> +# ADD BSC32 /nologo <%if(sharedname || staticname)%>/o"<%libout%>\<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.bsc"<%endif%> <%if(type_is_binary)%> LINK32=link.exe # ADD LINK32 <%systemlibs("winsock.lib commctrl.lib coredll.lib iphlpapi.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>\<%machine%>" <%endfor%>/nologo /base:"<%base("0x00100000")%>" <%stack%><%if(type_is_dynamic)%> /entry:"_DllMainCRTStartup"<%endif%> /nodefaultlib:"$(CENoDefaultLib)" /version:<%version("1.0")%> /subsystem:$(CESubsystem) /align:"<%align("4096")%>"<%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%>.pdb"<%endif%><%endif%><%endif%> <%if(type_is_dynamic)%> /dll<%endif%> <%if(use_debug_libraries)%>/debug<%endif%> /machine:<%machine%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%machine%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%machine%>\<%exename%>.exe<%endif%>" diff --git a/templates/nmake.mpd b/templates/nmake.mpd index df338ff4..32ed2184 100644 --- a/templates/nmake.mpd +++ b/templates/nmake.mpd @@ -147,9 +147,7 @@ RSC=rc.exe RSC_PROJ=/l 0x409 /fo"$(INTDIR)\<%basenoextension(resource_file)%>.res"<%foreach(defines cpu_defines macros)%> /d <%define%><%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> <%endfor%> BSC32=bscmake.exe -<%if(sharedname)%> -BSC32_FLAGS=/nologo <%if(type_is_dynamic)%>/o"$(OUTDIR)\<%sharedname%>.bsc"<%endif%> -<%endif%> +BSC32_FLAGS=/nologo <%if(sharedname || staticname)%>/o"$(OUTDIR)\<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.bsc"<%endif%> BSC32_SBRS= \ <%if(type_is_binary)%> 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" diff --git a/templates/vc6.mpd b/templates/vc6.mpd index 5757f21d..85b21661 100644 --- a/templates/vc6.mpd +++ b/templates/vc6.mpd @@ -58,7 +58,7 @@ LINK32=link.exe -lib <%endif%> # ADD RSC /l 0x409<%foreach(defines macros)%> /d <%define%><%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> BSC32=bscmake.exe -# ADD BSC32 /nologo <%if(sharedname)%>/o"<%libout%>\<%sharedname%>.bsc"<%endif%> +# ADD BSC32 /nologo <%if(sharedname || staticname)%>/o"<%libout%>\<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.bsc"<%endif%> <%if(type_is_binary)%> LINK32=link.exe # ADD LINK32 <%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.pdb"<%endif%><%endif%><%endif%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> /machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.exe<%endif%>" diff --git a/templates/vc6dsp.mpd b/templates/vc6dsp.mpd index 5757f21d..85b21661 100644 --- a/templates/vc6dsp.mpd +++ b/templates/vc6dsp.mpd @@ -58,7 +58,7 @@ LINK32=link.exe -lib <%endif%> # ADD RSC /l 0x409<%foreach(defines macros)%> /d <%define%><%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> BSC32=bscmake.exe -# ADD BSC32 /nologo <%if(sharedname)%>/o"<%libout%>\<%sharedname%>.bsc"<%endif%> +# ADD BSC32 /nologo <%if(sharedname || staticname)%>/o"<%libout%>\<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.bsc"<%endif%> <%if(type_is_binary)%> LINK32=link.exe # ADD LINK32 <%systemlibs("advapi32.lib user32.lib")%> /INCREMENTAL:<%incremental("NO")%> <%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(pdb)%><%if(sharedname)%> /pdb:"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb"<%else%><%if(exename)%> /pdb:"<%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.pdb"<%endif%><%endif%><%endif%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> /machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%><%if(install)%><%install%><%else%><%output_dir%><%endif%>\<%exename%>.exe<%endif%>" diff --git a/templates/vc7.mpd b/templates/vc7.mpd index dc5fbdaa..436c5e38 100644 --- a/templates/vc7.mpd +++ b/templates/vc7.mpd @@ -57,12 +57,18 @@ <Tool Name="VCCustomBuildTool"/> <Tool +<%if(type_is_static)%> + Name="VCLibrarianTool" +<%if(staticname)%> + OutputFile="$(OutDir)/<%staticname%><%lib_modifier%>.lib" +<%endif%> +<%else%> Name="VCLinkerTool" <%if(type_is_binary)%> AdditionalDependencies="<%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs defaultlibs)%><%lib%><%lib_modifier%>.lib<%fornotlast(" ")%><%endfor%>" <%endif%> <%if(exename || sharedname || staticname)%> - OutputFile="$(OutDir)/<%if(type_is_dynamic)%><%sharedname%><%lib_modifier%>.dll<%else%><%if(type_is_static)%><%staticname%><%lib_modifier%>.lib<%else%><%exename%>.exe<%endif%><%endif%>" + OutputFile="$(OutDir)/<%if(type_is_dynamic)%><%sharedname%><%lib_modifier%>.dll<%else%><%exename%>.exe<%endif%>" <%endif%> Version="<%version("1.0")%>" LinkIncremental="<%LinkIncremental("1")%>" @@ -86,6 +92,7 @@ <%if(type_is_dynamic)%> ImportLibrary="$(OutDir)/<%sharedname%><%lib_modifier%>.lib" <%endif%> +<%endif%> /> <Tool Name="VCMIDLTool"/> diff --git a/templates/vc7dll.mpt b/templates/vc7dll.mpt index 634d09fb..11927ee0 100644 --- a/templates/vc7dll.mpt +++ b/templates/vc7dll.mpt @@ -35,7 +35,8 @@ Static Release { output_dir = Static_Release intermediate_dir = Static_Release lib_modifier = s - need_staticflags = 1 + need_staticflags = 1 + configuration_type = 4 runtime_library = 2 } @@ -47,7 +48,8 @@ Static Debug { output_dir = Static_Debug intermediate_dir = Static_Debug lib_modifier = sd - need_staticflags = 1 + need_staticflags = 1 + configuration_type = 4 runtime_library = 3 } @@ -85,7 +87,8 @@ Static MFC Release { output_dir = Static_MFC_Release intermediate_dir = Static_MFC_Release lib_modifier = mfcs - need_staticflags = 1 + need_staticflags = 1 + configuration_type = 4 runtime_library = 2 use_mfc = 2 } @@ -98,7 +101,8 @@ Static MFC Debug { output_dir = Static_MFC_Debug intermediate_dir = Static_MFC_Debug lib_modifier = mfcsd - need_staticflags = 1 + need_staticflags = 1 + configuration_type = 4 runtime_library = 3 use_mfc = 2 } |