windows-version-1-5-20050817

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

diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index ec0cfad..3e3ca60 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -28,7 +28,8 @@
 #
 ####### Special optional defines
 
-!IFNDEF NO_CRTDBG              #don't set _CRTDBG_MAP_ALLOC flag for some module compliations
+!IFNDEF NO_CRTDBG              
+#don't set _CRTDBG_MAP_ALLOC flag for some module compliations
 #_CRTDBG_MAP_ALLOC=1
 !ENDIF
 
@@ -78,17 +79,23 @@ LIB = $(AFSDEV_LIB)
 
 #define used in WinNT/2000 installation and program version display
 AFSPRODUCT_VER_MAJOR=1
-AFSPRODUCT_VER_MINOR=3
-AFSPRODUCT_VER_PATCH=6390
+AFSPRODUCT_VER_MINOR=5
+AFSPRODUCT_VER_PATCH=0000
 AFSPRODUCT_VER_BUILD=0
+
+# For MSI installer, each major release should have a different GUID
+# http://msdn.microsoft.com/library/en-us/msi/setup/changing_the_product_code.asp
+AFSPRODUCT_VER_GUID=CCAF9E14-976E-46C0-8A1B-A218EAB7ADC5
+
 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
 AFSPRODUCT_FILE_VERSION=$(AFSPRODUCT_VER_MAJOR),$(AFSPRODUCT_VER_MINOR),$(AFSPRODUCT_VER_PATCH),$(AFSPRODUCT_VER_BUILD)
-CELLNAME_DEFAULT=Your Cell Name
+# Set CELLNAME_DEFAULT to "your cell name"
+CELLNAME_DEFAULT=openafs.org
 CELLSERVDB_INSTALL=CellServDB.GrandCentral
 CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
 TARGETOS = WINNT
 
-#              Define defaults folder locations
+# Define defaults folder locations
 DEST=dest
 SRC=src
 OBJ=obj
@@ -166,7 +173,7 @@ OUT=$(OJT)\$(RELDIR)
 # !ENDIF
 
 !IF ("$(APPVER)" == "")
-APPVER=4.0
+APPVER=5.0
 !ENDIF
 
 
@@ -233,16 +240,29 @@ afscflags =\
        /GF \
        /Gd \
        /Gy \
-       /GX \
        /Os
 
+!IF ("$(AFSVER_CL)"=="1400")
+afscflags = $(afscflags) /EHsc /wd4996
+!ELSE
+afscflags = $(afscflags) /GX
+!ENDIF
+
 !IF ("$(AFSVER_CL)"!="1200")
-afscdefs = $(afscdefs) /G7 /GT /GS
+afscdefs = $(afscdefs) /GT /GS
+#/Wp64
+!IF ("$(AFSVER_CL)"!="1400")
+afscdefs = $(afscdefs) /G7
+!ENDIF
+!ENDIF
+
+!IF ("$(AFSIFS)" == "TRUE")
+afscdefs = $(afscdefs) -DAFSIFS
 !ENDIF
 
 !IF ("$(AFSDEV_BUILDTYPE)" == "FREE")
 
-afscflags = $(afscflags) /Ox
+afscflags = $(afscflags) /Ox /Zi
 cdebug = $(cdebug:-Od=) # avoid annoying override warning (D4025)
 cvarsdll = $(cvarsdll:-MDd=-MD)
 NODEBUG=1
@@ -251,13 +271,15 @@ NODEBUG=1
 cdebug = $(cdebug:-Z7=-Zi)  # avoid annoying override warning (D4025)
 
 !IF ("$(AFSVER_CL)"=="1200")
-afscdefs = $(afscdefs) -DDEBUG /GZ
+afscdefs = $(afscdefs) -DDEBUG 
+afscflags = $(afscflags) /GZ
 !ELSE 
-afscdefs = $(afscdefs) -DDEBUG /RTCs /RTCu
+afscdefs = $(afscdefs) -DDEBUG 
+afscflags = $(afscflags) /RTCs /RTCu
 !ENDIF
 
 !IFDEF _CRTDBG_MAP_ALLOC
-afscflags = $(afscflags) -D_DEBUG -D_CRTDBG_MAP_ALLOC
+afscdefs = $(afscdefs) -D_DEBUG -D_CRTDBG_MAP_ALLOC
 !ENDIF
 
 !UNDEF NODEBUG
@@ -280,7 +302,7 @@ AFSDEV_WARNLEVEL = 3
 afscflags = $(afscflags) /W$(AFSDEV_WARNLEVEL)
 
 # C/C++ compilation macros
-C2OBJ   = $(cc) /Fo$@ /Fd$*.pdb $(cflags) $(cdebug) $(cvarsdll) $(afscflags) $(afscdefs) /c  
+C2OBJ   = $(cc) /Fo$@ /Fd$*.pdb $(cflags) $(cdebug) $(dafsifs) $(cvarsdll) $(afscflags) $(afscdefs) /c  
 CPP2OBJ = $(C2OBJ)
 # Inference rules for building and installing targets
 # Compile .c files, from current directory to defined by OUT
@@ -350,7 +372,7 @@ mfclibsdll = $(mfclibsdll:msvcrt.lib=)
 # Link with binmode.obj; files will be opened in binary mode by default.
 !IF ("$(AFSDEV_BUILDTYPE)" == "FREE")
 
-ldebug=
+ldebug=/DEBUG /PDB:$*.pdb 
 EXEPREP = rebase -b 0x00400000 -x $(@D) -q $@
 DLLPREP = rebase -i $(DESTDIR)\NTDllmap.txt -x $(@D) -q $@