diff options
| author | Tony Acero <tony.acero@gmail.com> | 2012-04-11 15:18:52 -0400 |
|---|---|---|
| committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2012-04-11 15:18:52 -0400 |
| commit | e2b6a449ce570c32f02c38e8f9898f9a6c4cefb4 (patch) | |
| tree | d356e9cb9823c47f704d73b62942c9a4bf1cd7ef /packages | |
| parent | 9be792055c8bef9d35b9d3e1412175dae18a5a97 (diff) | |
Windows: Visual Studio 10 support for installers
Change-Id: I845986247abf607694d2438afaffa6ea7d6fd5c4
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/windows/installer/NTMakefile | 4 |
1 files changed, 4 insertions, 0 deletions
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 |