From f381c62405e563aca10795e98a997e0b6544c240 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 26 Sep 2013 17:21:33 -0400 Subject: [PATCH] Windows: $(SDKREDISTDIR)\heimdal-version.mak Create a heimdal-version.mak include file which can be included in third party installer makefiles to determine which compiler and run time library type was used to build the merge modules. It is the responsibility of third party installer packages to include the Visual Studio CRT merge modules that are required for execution. Change-Id: Icec2f47755ef7cc5f7dde2e0426603dece7e4933 --- packages/windows/installer/NTMakefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile index f52e53b11..c9624ec63 100644 --- a/packages/windows/installer/NTMakefile +++ b/packages/windows/installer/NTMakefile @@ -126,6 +126,14 @@ VCVER=VC80 ! error Cant determine Visual C compiler version !endif +$(SDKREDISTDIR)\heimdal-version.mak: + @echo HEIMDAL_VCVER=$(VCVER) > $@ +!if "$(BUILD)"!="rel" + @echo HEIMDAL_CRT_DEBUG=yes >> $@ +!endif + +all:: $(SDKREDISTDIR)\heimdal-version.mak + !if "$(BUILD)"=="rel" CRTNAME=CRT !else