From 9a1328b9217902439abdbd3424fdd4e887169116 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Mon, 8 Jun 2009 03:15:12 +0000 Subject: [PATCH] windows-sync-head-with-1_5-20090607 LICENSE MIT Synchronize the build system from 1.5 branch to the head --- src/config/NTMakefile.amd64_w2k | 26 +++++++++++++++++++------- src/config/NTMakefile.i386_w2k | 17 ++++++++--------- src/des/NTMakefile | 8 ++++++++ 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k index 1554fbf38..bb92975ae 100644 --- a/src/config/NTMakefile.amd64_w2k +++ b/src/config/NTMakefile.amd64_w2k @@ -217,6 +217,11 @@ afscdefs =\ -DAFS_64BIT_ENV \ -DAFS_64BIT_CLIENT \ -DAFS_LARGEFILE_ENV \ + -D_USE_DECLSPECS_FOR_SAL=0 \ + -D_USE_ATTRIBUTES_FOR_SAL=0 \ + -D_ATL_SECURE_NO_DEPRECATE \ + -D_AFX_DISABLE_DEPRECATED \ + -D_AFX_SECURE_NO_WARNINGS \ $(AFSDEV_AUXCDEFINES) # Compiler switches (except include paths and preprocessor defines) @@ -227,7 +232,7 @@ afscdefs =\ # /GF pool strings and place in read-only memory # /Gd use cdecl calling convention by default # /Gy enable function-level linking -# /GX enable C++ exceptions (assumes extern C funcs never throw exceptions) +# /EHsc enable C++ exceptions (assumes extern C funcs never throw exceptions) # /Os favor small (over fast) code; seems to avoid 64-bit bugs in VC compiler afscflags =\ @@ -237,7 +242,7 @@ afscflags =\ /Gy \ /Os -!IF ("$(AFSVER_CL)"=="1400") +!IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)"=="1500") afscflags = $(afscflags) /EHsc /wd4996 !ELSE afscflags = $(afscflags) /GX @@ -246,7 +251,7 @@ afscflags = $(afscflags) /GX !IF ("$(AFSVER_CL)"!="1200") afscflags = $(afscflags) /GT /GS #/Wp64 -!IF ("$(AFSVER_CL)"!="1400") +!IF ("$(AFSVER_CL)"!="1400" && "$(AFSVER_CL)"!="1500") afscflags = $(afscflags) /G7 !ENDIF !ENDIF @@ -278,7 +283,7 @@ afscflags = $(afscflags) -D_DEBUG -D_CRTDBG_MAP_ALLOC _VC_MANIFEST_BASENAME = __OAFW.Debug !ENDIF -!IF ("$(AFSVER_CL)"=="1400") +!IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)"=="1500") _VC_MANIFEST_EMBED_EXE= \ if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1 @@ -309,6 +314,9 @@ AFSDEV_WARNLEVEL = 3 !ERROR Must define AFSDEV_WARNLEVEL to be one of 0 through 4. !ENDIF !ENDIF +!IF ("$(AFSDEV_WARNLEVEL)" == "4" && "$(AFSVER_CL)" == "1500") +_AFSDEV_WARNLEVEL=3 +!ENDIF afscflags = $(afscflags) /W$(AFSDEV_WARNLEVEL) @@ -363,10 +371,14 @@ RC = $(rc) $(rcvars) $(rcflags) $(AFSDEV_AUXRCFLAGS) /d "AFSPRODUCT_VERSION=\"$( #################### Link optional build flags set ########### -afslflags = $(afslflags) \ - /FIXED:NO /VERBOSE:LIB /MACHINE:X64 +afslflags = $(afslflags) /FIXED:NO /VERBOSE:LIB +!IF ("$(AFSVER_CL)"=="1500") +afslflags = $(afslflags) /MACHINE:AMD64 +!ELSE +afslflags = $(afslflags) /MACHINE:X64 +!ENDIF -!IF ("$(AFSVER_CL)"=="1400") +!IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)"=="1500") afslflags = $(afslflags) /MANIFEST !ENDIF diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k index cc02f87f1..9143359c7 100644 --- a/src/config/NTMakefile.i386_w2k +++ b/src/config/NTMakefile.i386_w2k @@ -37,7 +37,7 @@ #sanity checks -!IF ("$(CPU)" != "x86") +!IF ("$(CPU)" == "x86") CPU=i386 !ENDIF @@ -86,9 +86,9 @@ INCLUDE = $(AFSDEV_INCLUDE) LIB = $(AFSDEV_LIB) #define used in WinNT/2000 installation and program version display -AFSPRODUCT_VER_MAJOR=0 -AFSPRODUCT_VER_MINOR=0 -AFSPRODUCT_VER_PATCH=0 +AFSPRODUCT_VER_MAJOR=1 +AFSPRODUCT_VER_MINOR=5 +AFSPRODUCT_VER_PATCH=6001 AFSPRODUCT_VER_BUILD=0 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH) @@ -227,7 +227,6 @@ afscdefs =\ -DAFS_64BIT_ENV \ -DAFS_64BIT_CLIENT \ -DAFS_LARGEFILE_ENV \ - -DAFS_OLD_COM_ERR \ $(AFSDEV_AUXCDEFINES) # Compiler switches (except include paths and preprocessor defines) @@ -250,7 +249,7 @@ afscflags =\ /Gy \ /Os -!IF ("$(AFSVER_CL)"=="1400") +!IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)"=="1500") afscflags = $(afscflags) /EHsc /wd4996 !ELSE afscflags = $(afscflags) /GX @@ -259,7 +258,7 @@ afscflags = $(afscflags) /GX !IF ("$(AFSVER_CL)"!="1200") afscflags = $(afscflags) /GT /GS #/Wp64 -!IF ("$(AFSVER_CL)"!="1400") +!IF ("$(AFSVER_CL)"!="1400" && "$(AFSVER_CL)"!="1500") afscflags = $(afscflags) /G7 !ENDIF !ENDIF @@ -293,7 +292,7 @@ afscflags = $(afscflags) -D_DEBUG -D_CRTDBG_MAP_ALLOC _VC_MANIFEST_BASENAME = __OAFW.Debug !ENDIF -!IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)" == "1310") +!IF ("$(AFSVER_CL)"=="1500"|| "$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)" == "1310") _VC_MANIFEST_EMBED_EXE= \ if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1 @@ -385,7 +384,7 @@ RC = $(rc) $(rcvars) $(rcflags) $(AFSDEV_AUXRCFLAGS) /d "AFSPRODUCT_VERSION=\"$( afslflags =\ /FIXED:NO /VERBOSE:LIB /MACHINE:I386 -!IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)"=="1310") +!IF ("$(AFSVER_CL)"=="1500" || "$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)"=="1310") afslflags = $(afslflags) /MANIFEST !ENDIF diff --git a/src/des/NTMakefile b/src/des/NTMakefile index 04e456318..f1b879e62 100644 --- a/src/des/NTMakefile +++ b/src/des/NTMakefile @@ -120,34 +120,42 @@ $(OUT)\main.obj: main.c $(OUT)\make_keyperm.exe: $(OUT)\make_keyperm.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) + $(CODESIGN_USERLAND) $(OUT)\make_p_table.exe: $(OUT)\make_p_table.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) + $(CODESIGN_USERLAND) $(OUT)\make_s_table.exe: $(OUT)\make_s_table.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) + $(CODESIGN_USERLAND) $(OUT)\make_odd.exe: $(OUT)\make_odd.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) + $(CODESIGN_USERLAND) $(OUT)\make_p.exe: $(OUT)\make_p.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) + $(CODESIGN_USERLAND) $(OUT)\make_s.exe: $(OUT)\make_s.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) + $(CODESIGN_USERLAND) $(OUT)\make_fp.exe: $(OUT)\make_fp.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) + $(CODESIGN_USERLAND) $(OUT)\make_ip.exe: $(OUT)\make_ip.obj $(OUT)\misc.obj $(OUT)\main.obj $(EXECONLINK) $(_VC_MANIFEST_EMBED_EXE) + $(CODESIGN_USERLAND) GENOBJS = $(OUT)\make_keyperm.obj \ $(OUT)\make_p_table.obj \ -- 2.39.5