Make OpenAFS 1.9.0

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

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 8f01027..820df56 100644 (file)
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -70,8 +70,6 @@ AFSDEV_BUILDTYPE = NONE
 !ENDIF
 INCLUDE = $(AFSDEV_INCLUDE)
 
-PATH = $(AFSDEV_BIN);$(PATH)
-
 !IFNDEF AFSDEV_LIB
 !ERROR Must define AFSDEV_LIB to be the default library directories.
 !ENDIF
@@ -87,10 +85,10 @@ LIB = $(AFSDEV_LIB)
 AFSPRODUCT_VER_MAJOR=1
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_MINOR)
-AFSPRODUCT_VER_MINOR=5
+AFSPRODUCT_VER_MINOR=9
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_PATCH)
-AFSPRODUCT_VER_PATCH=7600
+AFSPRODUCT_VER_PATCH=0000
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0
@@ -100,7 +98,7 @@ AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_
 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
+CELLNAME_DEFAULT=grand.central.org
 !ENDIF
 CELLSERVDB_INSTALL=CellServDB.GrandCentral
 CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
@@ -192,6 +190,8 @@ OUT=$(OJT)\$(RELDIR)
 APPVER=5.02
 !ENDIF
 
+PATH = $(AFSDEV_BIN);$(DESTDIR)\lib;$(PATH)
+
 !INCLUDE <WIN32.MAK>
 
 # Extend and/or supplement definitions in WIN32.MAK.
@@ -224,6 +224,9 @@ MAKECMD = nmake.exe
 !IF !DEFINED(MIDL)
 MIDL  = midl
 !ENDIF
+!IF !DEFINED(PERL)
+PERL = perl
+!ENDIF
 
 COMPILE_ET = $(DESTDIR)\bin\compile_et
 RXGEN = $(DESTDIR)\bin\rxgen
@@ -246,10 +249,10 @@ afscdefs =\
        -DSTRICT \
        -D_WIN32_IE=0x0502 \
        -D_WIN32_WINNT=0x0502 \
-       -DWINVER=0x0502 \
+       -DWINVER=0x0502 \
        -DNTDDI_VERSION=0x05020000 \
-       -DREGISTER_POWER_NOTIFICATIONS \
-       -DAFS_FREELANCE_CLIENT \
+       -DREGISTER_POWER_NOTIFICATIONS \
+       -DAFS_FREELANCE_CLIENT \
         -DAFS_64BITPOINTER_ENV \
         -DAFS_64BITUSERPOINTER_ENV \
        -DAFS_64BIT_CLIENT \
@@ -407,6 +410,9 @@ CPP2OBJ = $(C2OBJ)
 .h.{$(DESTDIR)\include\rx}.h:
        $(COPY) $< $(DESTDIR)\include\rx
 
+.h.{$(DESTDIR)\include\opr}.h:
+       $(COPY) $< $(DESTDIR)\include\opr
+
 .h.{$(DESTDIR)\include\des}.h:
        $(COPY) $< $(DESTDIR)\include
 
@@ -428,6 +434,9 @@ CPP2OBJ = $(C2OBJ)
 .h.{$(DESTDIR)\include\rx}.h:
        $(COPY) $(*B).h $(DESTDIR)\include\rx
 
+.h.{$(DESTDIR)\include\opr}.h:
+       $(COPY) $(*B).h $(DESTDIR)\include\opr
+
 .h.{$(DESTDIR)\include\des}.h:
        $(COPY) $(*B).h $(DESTDIR)\include
 
@@ -513,7 +522,7 @@ DLLPREP = rebase -i $(DESTDIR)\NTDllmap.txt -q $@
 !ENDIF #CHECKED BUILD
 
 # EXE link macro for console applications
-EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib  version.lib $** 
+EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) user32.lib  version.lib $** 
 
 # EXE link macro for GUI applications
 EXEGUILINK = $(link) /OUT:$@ $(ldebug) $(guilflags) $(afslflags) $(guilibsdll) $**
@@ -527,7 +536,7 @@ DLLCONLINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(conlibsdll) $
 # DLL link macro for GUI applications
 DLLGUILINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(guilibsdll)  $**
 
-EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib version.lib $**
+EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) user32.lib version.lib $**
 
 DLLMFCLINK = $(link) /OUT:$@ $(ldebug) $(mfcdlllflags) $(afslflags) $(mfclibsdll) $**
 
@@ -558,3 +567,21 @@ MAKECYGLIB=\
 !ELSE
 MAKECYGLIB=echo Skipping Cygwin archive
 !ENDIF
+
+######### Heimdal compatibility support
+
+!IFNDEF HEIMDALSDKDIR
+!IFDEF KERBEROSCOMPATSDKROOT
+HEIMDALSDKDIR=$(KERBEROSCOMPATSDKROOT)\1.0
+!ELSE
+!ERROR HEIMDALSDKDIR or KERBEROSCOMPATSDKROOT needs to be defined
+!ENDIF
+!ENDIF
+
+HEIMINC=$(HEIMDALSDKDIR)\inc
+HEIMLIB=$(HEIMDALSDKDIR)\lib\$(CPU)
+
+afscdefs=$(afscdefs) -I$(HEIMINC) -I$(HEIMINC)\krb5
+
+HEIMDEPS=$(HEIMLIB)\heimdal.lib $(DESTDIR)\lib\krbcompat_delayload.obj
+HEIMLINKOPTS=/DELAYLOAD:heimdal.dll