windows-wix-install-20050925

[openafs.git] / src / WINNT / install / NSIS / NTMakefile

diff --git a/src/WINNT/install/NSIS/NTMakefile b/src/WINNT/install/NSIS/NTMakefile
index b90525f..52e8811 100644 (file)
--- a/src/WINNT/install/NSIS/NTMakefile
+++ b/src/WINNT/install/NSIS/NTMakefile
@@ -22,11 +22,19 @@ $(OUT)\Killer.obj: Killer.cpp
 $(EXEDIR)\Killer.exe: $(OUT)\Killer.obj
       $(EXECONLINK) $(OUT)\Killer.obj
 
+$(OUT)\AdminGroup.obj: AdminGroup.cpp
+      $(C2OBJ) AdminGroup.cpp
+
+$(EXEDIR)\AdminGroup.exe: $(OUT)\AdminGroup.obj
+      $(EXECONLINK) $(OUT)\AdminGroup.obj
+
 prebuild:
 !IF ("$(AFSDEV_BUILDTYPE)" == "FREE")
-!IF ("$(AFSVER_CL)"=="1310")
+!IF ("$(AFSVER_CL)"=="1400")
+   $(COPY) %SystemRoot%\System32\Msvcr80.dll $(EXEDIR)
+   $(COPY) %SystemRoot%\System32\MFC80.DLL $(EXEDIR)
+!ELSE IF ("$(AFSVER_CL)"=="1310")
    $(COPY) %SystemRoot%\System32\Msvcr71.dll $(EXEDIR)
-   $(COPY) %SystemRoot%\System32\MSVCRT.DLL $(EXEDIR)
    $(COPY) %SystemRoot%\System32\MFC71.DLL $(EXEDIR)
 !ELSE IF ("$(AFSVER_CL)"=="1300")
    $(COPY) %SystemRoot%\System32\Msvcp70.dll $(EXEDIR)
@@ -39,7 +47,12 @@ prebuild:
 !ERROR Unknown Compiler Version
 !ENDIF
 !ELSE # NOT FREE - CHECKED
-!IF ("$(AFSVER_CL)"=="1310")
+!IF ("$(AFSVER_CL)"=="1400")
+   $(COPY) %SystemRoot%\System32\Msvcr80d.dll $(EXEDIR)
+   $(COPY) %SystemRoot%\System32\Msvcr80d.pdb $(EXEDIR)
+   $(COPY) %SystemRoot%\System32\MFC80D.DLL $(EXEDIR)
+   $(COPY) %SystemRoot%\System32\MFC80D.pdb $(EXEDIR)
+!ELSE IF ("$(AFSVER_CL)"=="1310")
    $(COPY) %SystemRoot%\System32\Msvcr71d.dll $(EXEDIR)
    $(COPY) %SystemRoot%\System32\Msvcr71d.pdb $(EXEDIR)
    $(COPY) %SystemRoot%\System32\MFC71D.DLL $(EXEDIR)
@@ -69,11 +82,16 @@ prebuild:
    $(DESTDIR)\bin\util_cr.exe _echo "!define " >>$(OUT)\nsi-includes.nsi 
    "$(NSISDIR)\makensis.exe" /VERSION >>$(OUT)\nsi-includes.nsi          
    echo. >>$(OUT)\nsi-includes.nsi                                       
-!if ("$(AFSVER_CL)" == "1310")
+!if ("$(AFSVER_CL)" == "1400")
+   echo !define CL_1310 1 >> $(OUT)\nsi-includes.nsi
+!else if ("$(AFSVER_CL)" == "1310")
    echo !define CL_1310 1 >> $(OUT)\nsi-includes.nsi
 !else if ("$(AFSVER_CL)" == "1300")
    echo !define CL_1300 1 >> $(OUT)\nsi-includes.nsi
 !endif
+!if ("$(AFSIFS)" == "TRUE")
+   echo !define AFSIFS 1 >> $(OUT)\nsi-includes.nsi
+!endif
 !if ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
    echo !define DEBUG 1 >>$(OUT)\nsi-includes.nsi
 !endif
@@ -81,7 +99,7 @@ prebuild:
 build: prebuild
    "C:\Program Files\NSIS\makensis.exe" /DINCLUDEDIR=$(OUT) OpenAFS.nsi
 
-install: $(OUT)\Service.obj $(EXEDIR)\Service.exe $(OUT)\Killer.obj $(EXEDIR)\Killer.exe build
+install: $(OUT)\Service.obj $(EXEDIR)\Service.exe $(OUT)\Killer.obj $(EXEDIR)\Killer.exe $(EXEDIR)\AdminGroup.exe build
 
 #clean:
 #   $(DEL) $(OUT)\Service.obj