!ENDIF
INCLUDE = $(AFSDEV_INCLUDE)
+PATH = $(AFSDEV_BIN);$(PATH)
!IFNDEF AFSDEV_LIB
!ERROR Must define AFSDEV_LIB to be the default library directories.
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
+!IF !DEFINED(AFSPRODUCT_VER_MAJOR)
+AFSPRODUCT_VER_MAJOR=1
+!ENDIF
+!IF !DEFINED(AFSPRODUCT_VER_MINOR)
+AFSPRODUCT_VER_MINOR=5
+!ENDIF
+!IF !DEFINED(AFSPRODUCT_VER_PATCH)
+AFSPRODUCT_VER_PATCH=7600
+!ENDIF
+!IF !DEFINED(AFSPRODUCT_VER_BUILD)
AFSPRODUCT_VER_BUILD=0
+!ENDIF
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)
# Set CELLNAME_DEFAULT to "your cell name"
+!IF !DEFINED(CELLNAME_DEFAULT)
CELLNAME_DEFAULT=openafs.org
+!ENDIF
CELLSERVDB_INSTALL=CellServDB.GrandCentral
CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
TARGETOS = WINNT
# Define defaults folder locations
-DEST=dest
-SRC=src
-OBJ=obj
+!if !defined(DEST)
+DEST=$(AFSROOT)\dest
+!endif
+!if !defined(SRC)
+SRC=$(AFSROOT)\src
+!endif
+!if !defined(OBJ)
+OBJ=$(AFSROOT)\obj
+!endif
+!if !defined(DOC)
+DOC=$(AFSROOT)\doc
+!endif
!IF ("$(AFS_OBJDIR)"=="")
######### AFS_OBJDIR is NOT used use default locations
! IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\checked
-OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\checked
+DESTDIR=$(DEST)\$(SYS_NAME)\checked
+OJT=$(OBJ)\$(SYS_NAME)\checked
! ELSE
-DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\free
-OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\free
+DESTDIR=$(DEST)\$(SYS_NAME)\free
+OJT=$(OBJ)\$(SYS_NAME)\free
! ENDIF
UTIL_CR = $(DESTDIR)\bin\util_cr.exe
!ELSE
! IF (EXIST($(AFSROOT)\$(AFS_OBJDIR)))
# AFS_OBJDIR is relative path
! IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\checked
+DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\dest\$(SYS_NAME)\checked
OJT=$(AFSROOT)\$(AFS_OBJDIR)\$(SYS_NAME)\checked\config
! ELSE
OJT=$(AFSROOT)\$(AFS_OBJDIR)\$(SYS_NAME)\free\config
-DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\free
+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)\$(SYS_NAME)\checked
+DESTDIR=$(AFS_OBJDIR)\dest\$(SYS_NAME)\checked
OJT=$(AFS_OBJDIR)\$(SYS_NAME)\checked\config
! ELSE
-DESTDIR=$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\free
+DESTDIR=$(AFS_OBJDIR)\dest\$(SYS_NAME)\free
OJT=$(AFS_OBJDIR)\$(SYS_NAME)\free\config
! ENDIF
! ELSE
# Extend and/or supplement definitions in WIN32.MAK.
# Command macros.
+!IF !DEFINED(COPY)
COPY = -copy
+!ENDIF
+!IF !DEFINED(DEL)
DEL = -del
-MKDIR = -mkdir
+!ENDIF
+!IF !DEFINED(MKDIR)
+MKDIR = -md
+!ENDIF
+!IF !DEFINED(REN)
REN = ren
+!ENDIF
+!IF !DEFINED(ECHO)
ECHO = echo
+!ENDIF
+!IF !DEFINED(CD)
CD = cd
-MC = mc -vcsU
+!ENDIF
+!IF !DEFINED(MC)
+MC = mc -vcU
+!ENDIF
+!IF !DEFINED(MAKECMD)
MAKECMD = nmake.exe
+!ENDIF
+!IF !DEFINED(MIDL)
+MIDL = midl
+!ENDIF
COMPILE_ET = $(DESTDIR)\bin\compile_et
RXGEN = $(DESTDIR)\bin\rxgen
-MIDL = midl
# Common clean target.
clean::
- $(DEL) /q $(OUT)\*.obj $(OUT)\*.lib $(OUT)\*.dll $(OUT)\*.exe $(OUT)\*.pdb
+ $(DEL) /q $(OUT)\*.obj $(OUT)\*.lib $(OUT)\*.dll $(OUT)\*.exe $(OUT)\*.pdb $(OUT)\*.res $(OUT)\*.manifest $(OUT)\*.exp
$(DEL) /q $(OUT)\*_component_version_number.* *_component_version_number.*
# Common lang target.
afscdefs =\
-I. \
-I$(DESTDIR)\include \
- -I$(DESTDIR)\include\afs \
- -I$(DESTDIR)\include\rx \
-DWIN32_LEAN_AND_MEAN \
-DSTRICT \
-D_WIN32_IE=0x0502 \
-D_WIN32_WINNT=0x0502 \
-DWINVER=0x0502 \
+ -DNTDDI_VERSION=0x05020000 \
-DREGISTER_POWER_NOTIFICATIONS \
- -DAFS_AFSDB_ENV \
-DAFS_FREELANCE_CLIENT \
- -DAFS_64BIT_ENV \
+ -DAFS_64BITPOINTER_ENV \
+ -DAFS_64BITUSERPOINTER_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)
# /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 =\
/Gy \
/Os
-!IF ("$(AFSVER_CL)"=="1400")
+!IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)"=="1500")
afscflags = $(afscflags) /EHsc /wd4996
!ELSE
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
_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
_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 $@
+!IF "$(SIGNTOOL)" == ""
+SIGNTOOL=signtool.exe
+!ENDIF
+
+!IF DEFINED(CODESIGN_TIMESTAMP)
+!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL)
+CODESIGN_USERLAND= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) /v $(CODESIGN_OTHER) $@
+!IF "$(CODESIGN_CROSS_CERT)" != ""
+CODESIGN_KERNEL= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) $(CODESIGN_OTHER) /ac "$(CODESIGN_CROSS_CERT)" /v $@
+!ENDIF
+!ENDIF
!ELSE
-CODESIGN_USERLAND=
+!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL)
+CODESIGN_USERLAND= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /v $(CODESIGN_OTHER) $@
+!IF "$(CODESIGN_CROSS_CERT)" != ""
+CODESIGN_KERNEL= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /v $(CODESIGN_OTHER) /ac "$(CODESIGN_CROSS_CERT)" $@
+!ENDIF
+!ENDIF
+!ENDIF
+
+!IF DEFINED(SYMSTORE_EXE) && DEFINED(SYMSTORE_ROOT)
+!IF "$(SYMSTORE_COMMENT)" != ""
+SYMSTORE_COMMENT = |$(SYMSTORE_COMMENT)
+!ENDIF
+SYMSTORE_IMPORT= \
+$(SYMSTORE_EXE) add /s $(SYMSTORE_ROOT) /t "OpenAFS for Windows" /v "$(AFSBLD_TYPE)-$(CPU)-$(AFSPRODUCT_VERSION)" /c "$(@F)$(SYMSTORE_COMMENT)" /f $*.*
+!ELSE
+SYMSTORE_IMPORT=
!ENDIF
# Set compiler warning level
!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)
.h.{$(DESTDIR)\include\rx}.h:
$(COPY) $< $(DESTDIR)\include\rx
+.h.{$(DESTDIR)\include\des}.h:
+ $(COPY) $< $(DESTDIR)\include
+
+.h.{$(DESTDIR)\include\hcrypto}.h:
+ $(COPY) $< $(DESTDIR)\include\hcrypto
+
.h.{$(DESTDIR)\include}.h:
$(COPY) $< $(DESTDIR)\include
.h.{$(DESTDIR)\include\rx}.h:
$(COPY) $(*B).h $(DESTDIR)\include\rx
+.h.{$(DESTDIR)\include\des}.h:
+ $(COPY) $(*B).h $(DESTDIR)\include
+
+.h.{$(DESTDIR)\include\hcrypto}.h:
+ $(COPY) $(*B).h $(DESTDIR)\include\hcrypto
+
.h.{$(DESTDIR)\include\WINNT}.h:
$(COPY) $(*B).h $(DESTDIR)\include\WINNT
#################### 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
git://git.openafs.org / openafs.git / blobdiff