From 08b798494ea4e63363386797e2a1af65704cfab6 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 1 Jul 2005 20:47:14 +0000 Subject: [PATCH] STABLE14-windows-makefile-fix-20050701 Fixes that were applied to the head as part of the IFS changes but whose delta was not ready for the 1-4 branch. afscdefs should only include defines. afscflags should only include compiler switches update version to 1.3.8500 --- src/config/NTMakefile.amd64_w2k | 12 +++++++----- src/config/NTMakefile.i386_nt40 | 12 +++++++----- src/config/NTMakefile.i386_w2k | 12 +++++++----- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k index 87fea4e14..08d8e8494 100644 --- a/src/config/NTMakefile.amd64_w2k +++ b/src/config/NTMakefile.amd64_w2k @@ -80,7 +80,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=8400 +AFSPRODUCT_VER_PATCH=8500 AFSPRODUCT_VER_BUILD=0 # For MSI installer, each major release should have a different GUID @@ -251,10 +251,10 @@ afscflags = $(afscflags) /GX !ENDIF !IF ("$(AFSVER_CL)"!="1200") -afscdefs = $(afscdefs) /GT /GS +afscflags = $(afscflags) /GT /GS #/Wp64 !IF ("$(AFSVER_CL)"!="1400") -afscdefs = $(afscdefs) /G7 +afscflags = $(afscflags) /G7 !ENDIF !ENDIF @@ -269,9 +269,11 @@ 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 diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40 index f0e28b00f..30a70a5ff 100644 --- a/src/config/NTMakefile.i386_nt40 +++ b/src/config/NTMakefile.i386_nt40 @@ -80,7 +80,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=8400 +AFSPRODUCT_VER_PATCH=8500 AFSPRODUCT_VER_BUILD=0 # For MSI installer, each major release should have a different GUID @@ -249,10 +249,10 @@ afscflags = $(afscflags) /GX !ENDIF !IF ("$(AFSVER_CL)"!="1200") -afscdefs = $(afscdefs) /GT /GS +afscflags = $(afscflags) /GT /GS #/Wp64 !IF ("$(AFSVER_CL)"!="1400") -afscdefs = $(afscdefs) /G7 +afscflags = $(afscflags) /G7 !ENDIF !ENDIF @@ -267,9 +267,11 @@ 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 diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k index f0e28b00f..30a70a5ff 100644 --- a/src/config/NTMakefile.i386_w2k +++ b/src/config/NTMakefile.i386_w2k @@ -80,7 +80,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=8400 +AFSPRODUCT_VER_PATCH=8500 AFSPRODUCT_VER_BUILD=0 # For MSI installer, each major release should have a different GUID @@ -249,10 +249,10 @@ afscflags = $(afscflags) /GX !ENDIF !IF ("$(AFSVER_CL)"!="1200") -afscdefs = $(afscdefs) /GT /GS +afscflags = $(afscflags) /GT /GS #/Wp64 !IF ("$(AFSVER_CL)"!="1400") -afscdefs = $(afscdefs) /G7 +afscflags = $(afscflags) /G7 !ENDIF !ENDIF @@ -267,9 +267,11 @@ 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 -- 2.39.5