From d208fdf7cf76b55cbf6cfcc097b22d6624bce98b Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Thu, 9 Mar 2006 22:28:22 +0000 Subject: [PATCH] Need two MT commands, one for dll filess and one for exe files. --- configure/RULES_BUILD | 6 +++--- configure/os/CONFIG.win32-x86.win32-x86 | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 6ce927baf..bed96c546 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -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) $@ diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index a6ee119e5..b6b0127c8 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -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