release-vs-debug-flags-20040427

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

diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index 8338a42..ec0cfad 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -79,7 +79,7 @@ LIB = $(AFSDEV_LIB)
 #define used in WinNT/2000 installation and program version display
 AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=3
-AFSPRODUCT_VER_PATCH=5100
+AFSPRODUCT_VER_PATCH=6390
 AFSPRODUCT_VER_BUILD=0
 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)
@@ -207,15 +207,16 @@ afscdefs =\
        -I$(DESTDIR)\include\rx \
        -DWIN32_LEAN_AND_MEAN \
        -DSTRICT \
-       -D_WIN32_IE=0x0400 \
-       -D_WIN32_WINNT=0x0400 \
-       -DAFS_AFSDB_ENV \
-       -DAFS_FREELANCE_CLIENT \
-       -DAFS_64BIT_ENV \
+       -D_WIN32_IE=0x0500 \
+       -D_WIN32_WINNT=0x0500 \
+    -DWINVER=0x0500 \
+    -DREGISTER_POWER_NOTIFICATIONS \
+    -DAFS_AFSDB_ENV \
+    -DAFS_FREELANCE_CLIENT \
+    -DAFS_64BIT_ENV \
        -DAFS_64BIT_CLIENT \
         $(AFSDEV_AUXCDEFINES)
 
-
 # Compiler switches (except include paths and preprocessor defines)
 #
 # Note: if conflicting options are specified, rightmost option applies.
@@ -228,13 +229,17 @@ afscdefs =\
 # /Os   favor small (over fast) code; seems to avoid 64-bit bugs in VC compiler
 
 afscflags =\
-       /Oy- \
+    /Oy- \
        /GF \
        /Gd \
        /Gy \
        /GX \
        /Os
 
+!IF ("$(AFSVER_CL)"!="1200")
+afscdefs = $(afscdefs) /G7 /GT /GS
+!ENDIF
+
 !IF ("$(AFSDEV_BUILDTYPE)" == "FREE")
 
 afscflags = $(afscflags) /Ox
@@ -246,7 +251,9 @@ NODEBUG=1
 cdebug = $(cdebug:-Z7=-Zi)  # avoid annoying override warning (D4025)
 
 !IF ("$(AFSVER_CL)"=="1200")
-afscdefs = $(afscdefs) -DDEBUG
+afscdefs = $(afscdefs) -DDEBUG /GZ
+!ELSE 
+afscdefs = $(afscdefs) -DDEBUG /RTCs /RTCu
 !ENDIF
 
 !IFDEF _CRTDBG_MAP_ALLOC