From e2b6a449ce570c32f02c38e8f9898f9a6c4cefb4 Mon Sep 17 00:00:00 2001 From: Tony Acero Date: Wed, 11 Apr 2012 15:18:52 -0400 Subject: [PATCH] Windows: Visual Studio 10 support for installers Change-Id: I845986247abf607694d2438afaffa6ea7d6fd5c4 --- packages/windows/installer/NTMakefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile index 42e89f987..af86a0662 100644 --- a/packages/windows/installer/NTMakefile +++ b/packages/windows/installer/NTMakefile @@ -122,7 +122,11 @@ MMDIR=$(SystemDrive)\Program Files (x86)\Common Files\Merge Modules !if exist("$(MMDIR)") RUNTIMEMODULE32="$(MMDIR)\Microsoft_$(VCVER)_$(CRTNAME)_x86.msm" +!if "$(VCVER)"=="VC100" +RUNTIMEMODULE64="$(MMDIR)\Microsoft_$(VCVER)_$(CRTNAME)_x64.msm" +!else RUNTIMEMODULE64="$(MMDIR)\Microsoft_$(VCVER)_$(CRTNAME)_x86_x64.msm" +!endif !else