DEVEL15-windows-cl1310-manifests-20070918

add support for manifests to .NET 2003 builds

(cherry picked from commit 8ba598cd84988f049535b3f9ded3bafa3cfde4ff)

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index bdec44fe2b7c0c336226927080917bc5b36ae577..35444b34ebc207e259c027ff2dcf40e76a41b5b9 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -269,6 +269,7 @@ afscflags = $(afscflags) /Ox /Zi
 cdebug = $(cdebug:-Od=) # avoid annoying override warning (D4025)
 cvarsdll = $(cvarsdll:-MDd=-MD)
 NODEBUG=1
+_VC_MANIFEST_BASENAME = __OAFW
 
 !ELSE          # CHECKED BUILD
 cdebug = $(cdebug:-Z7=-Zi)  # avoid annoying override warning (D4025)
@@ -284,6 +285,18 @@ afscflags = $(afscflags) -D_DEBUG -D_CRTDBG_MAP_ALLOC
 !ENDIF
 
 !UNDEF NODEBUG
+_VC_MANIFEST_BASENAME = __OAFW.Debug
+!ENDIF
+
+!IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)" == "1310")
+_VC_MANIFEST_EMBED_EXE= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
+
+_VC_MANIFEST_EMBED_DLL= \
+if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
+!ELSE
+_VC_MANIFEST_EMBED_EXE=
+_VC_MANIFEST_EMBED_DLL=
 !ENDIF
 
 # Set compiler warning level
@@ -358,7 +371,11 @@ RC = $(rc) $(rcvars) $(rcflags) $(AFSDEV_AUXRCFLAGS) /d "AFSPRODUCT_VERSION=\"$(
 #################### Link optional build flags set ###########
 
 afslflags =\
-       /FIXED:NO /VERBOSE:LIB
+       /FIXED:NO /VERBOSE:LIB /MACHINE:I386
+
+!IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)"=="1310")
+afslflags = $(afslflags) /MANIFEST
+!ENDIF
 
 mfclflags = $(guilflags)
 mfclflags = $(mfclflags:/NODEFAULTLIB=)