#
####### 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
#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=8002
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
# !ENDIF
!IF ("$(APPVER)" == "")
-APPVER=4.0
+APPVER=5.0
!ENDIF
-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.
# /Os favor small (over fast) code; seems to avoid 64-bit bugs in VC compiler
afscflags =\
- /Oy- \
+ /Oy- \
/GF \
/Gd \
/Gy \
- /GX \
/Os
-cdebug = $(cdebug:-Z7=-Zi) # avoid annoying override warning (D4025)
-!IF ("APPSVER"=="1300")
-cdebug = $(cdebug) -Zi
+!IF ("$(AFSVER_CL)"=="1400")
+afscflags = $(afscflags) /EHsc /wd4996
+!ELSE
+afscflags = $(afscflags) /GX
+!ENDIF
+
+!IF ("$(AFSVER_CL)"!="1200")
+afscdefs = $(afscdefs) /GT /GS
+#/Wp64
+!IF ("$(AFSVER_CL)"!="1400")
+afscdefs = $(afscdefs) /G7
+!ENDIF
!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
!ELSE # CHECKED BUILD
+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
# 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 $@