Need two MT commands, one for dll filess and one for exe files.

This commit is contained in:
Janet B. Anderson
2006-03-09 22:28:22 +00:00
parent 7e841f73fe
commit d208fdf7cf
2 changed files with 5 additions and 4 deletions

View File

@@ -164,7 +164,7 @@ $(DIRECTORY_TARGETS) :
$(TESTPRODNAME) $(PRODNAME):%$(EXE): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
@$(RM) $@
$(DEBUGCMD) $(LINK.cpp)
$(MT_COMMAND)
$(MT_EXE_COMMAND)
# object libs for R3.13 vxWorks compatibility only
$(OBJLIBNAME):%$(OBJ): $(OBJLIB_LD_OBJS)
@@ -270,12 +270,12 @@ endif # RANLIB
$(DLL_LINK_LIBNAME):$(SHRLIB_PREFIX)%.lib: $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
@$(RM) $@
$(LINK.shrlib)
$(MT_COMMAND)
$(MT_DLL_COMMAND)
$(SHRLIBNAME):$(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
@$(RM) $@
$(LINK.shrlib)
$(MT_COMMAND)
$(MT_DLL_COMMAND)
$(LOADABLE_SHRLIBNAME):$(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX): $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
@$(RM) $@

View File

@@ -299,6 +299,7 @@ LINK.cpp = $(WINLINK) -nologo $(STATIC_LDFLAGS) $(LDFLAGS) $(PROD_LDFLAGS) -out:
# useManifestTool.pl returns 0(don't use) or 1(use).
#
ifeq ($(shell $(PERL) $(TOOLS)/useManifestTool.pl),1)
MT_COMMAND = mt.exe /manifest $@.manifest /outputresource:$@;\#2
MT_DLL_COMMAND = mt.exe /manifest $@.manifest /outputresource:$@;\#2
MT_EXE_COMMAND = mt.exe /manifest $@.manifest /outputresource:$@;\#1
endif