windows-config-ntmakefile-i386_w2k-codesign-20080702

[openafs.git] / src / config / NTMakefile.i386_w2k

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 1697fad..61b6dc9 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -37,6 +37,10 @@
 
 #sanity checks 
 
+!IF ("$(CPU)" != "x86")
+CPU=i386
+!ENDIF
+
 !IF ("$(CPU)" != "i386")
 !ERROR Platform SDK not configured for i386
 !ENDIF
@@ -82,9 +86,9 @@ INCLUDE = $(AFSDEV_INCLUDE)
 LIB = $(AFSDEV_LIB)
 
 #define used in WinNT/2000 installation and program version display
-AFSPRODUCT_VER_MAJOR=1
-AFSPRODUCT_VER_MINOR=5
-AFSPRODUCT_VER_PATCH=0000
+AFSPRODUCT_VER_MAJOR=0
+AFSPRODUCT_VER_MINOR=0
+AFSPRODUCT_VER_PATCH=0
 AFSPRODUCT_VER_BUILD=0
 
 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
@@ -103,11 +107,11 @@ OBJ=obj
 !IF ("$(AFS_OBJDIR)"=="") 
 #########  AFS_OBJDIR is NOT used use default locations
 !  IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFSROOT)\$(DEST)\checked
-OJT=$(AFSROOT)\$(OBJ)\checked
+DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\checked
+OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\checked
 !  ELSE
-DESTDIR=$(AFSROOT)\$(DEST)\free
-OJT=$(AFSROOT)\$(OBJ)\free
+DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\free
+OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\free
 !  ENDIF
 UTIL_CR = $(DESTDIR)\bin\util_cr.exe
 !ELSE
@@ -116,21 +120,21 @@ UTIL_CR = $(DESTDIR)\bin\util_cr.exe
 !  IF (EXIST($(AFSROOT)\$(AFS_OBJDIR)))
 #  AFS_OBJDIR is relative path
 !    IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\checked
-OJT=$(AFSROOT)\$(AFS_OBJDIR)\checked\config
+DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\checked
+OJT=$(AFSROOT)\$(AFS_OBJDIR)\$(SYS_NAME)\checked\config
 !    ELSE
-OJT=$(AFSROOT)\$(AFS_OBJDIR)\free\config
-DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\free
+OJT=$(AFSROOT)\$(AFS_OBJDIR)\$(SYS_NAME)\free\config
+DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\free
 !    ENDIF
 !  ELSE
 !    IF (EXIST($(AFS_OBJDIR)))
 #   AFS_OBJDIR is full path
 !    IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFS_OBJDIR)\$(DEST)\checked
-OJT=$(AFS_OBJDIR)\checked\config
+DESTDIR=$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\checked
+OJT=$(AFS_OBJDIR)\$(SYS_NAME)\checked\config
 !      ELSE
-DESTDIR=$(AFS_OBJDIR)\$(DEST)\free
-OJT=$(AFS_OBJDIR)\free\config
+DESTDIR=$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\free
+OJT=$(AFS_OBJDIR)\$(SYS_NAME)\free\config
 !      ENDIF
 !    ELSE
 !ERROR Can't find location of DEST directory!
@@ -223,6 +227,7 @@ afscdefs =\
        -DAFS_64BIT_ENV \
        -DAFS_64BIT_CLIENT \
        -DAFS_LARGEFILE_ENV \
+        -DAFS_OLD_COM_ERR \
         $(AFSDEV_AUXCDEFINES)
 
 # Compiler switches (except include paths and preprocessor defines)
@@ -269,6 +274,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 +290,25 @@ 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
+
+!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL) && DEFINED(CODESIGN_TIMESTAMP)
+CODESIGN_USERLAND= signtool.exe sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) \
+        /t $(CODESIGN_TIMESTAMP) /v $@
+!ELSE
+CODESIGN_USERLAND=
 !ENDIF
 
 # Set compiler warning level
@@ -358,7 +383,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=)