From 2739bf88195f18318bf6a27b6cc782b22332d959 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Fri, 17 Apr 2009 19:02:56 +0000
Subject: [PATCH] Use the CRT version appropriate for our target architecture.

svn path=/trunk/; revision=28079
---
 config.nmake | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/config.nmake b/config.nmake
index 4fc66641ac..78f892b5c4 100644
--- a/config.nmake
+++ b/config.nmake
@@ -56,11 +56,13 @@ TOOLS_DIR=tools
 # (sorry ARM, Alpha, MIPS, and Itanium fans).
 # CPU (Used by win32.mak) should be one of "i386" or "AMD64".
 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
-TARGET_MACHINE=X86
+TARGET_MACHINE=x86
 CPU=i386
+VCREDIST_DLL=x86
 !else if "$(WIRESHARK_TARGET_PLATFORM)" == "win64"
-TARGET_MACHINE=X64
+TARGET_MACHINE=x64
 CPU=AMD64
+VCREDIST_DLL=amd64
 !else
 !error Your mysterious moon-man architecture "$(WIRESHARK_TARGET_PLATFORM)" frightens and confuses us.
 !endif
@@ -797,15 +799,15 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio .NET 2003\Visual Studio .NET
 # no redistributable available for this package!
 
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005"
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\*.*
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\$(VCREDIST_DLL)\Microsoft.VC80.CRT\*.*
 
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE"
 # you need to download the redistributable package vcredist_x86.exe from Microsoft first,
 # and copy it to the lib folder!!!
-VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_x86.exe
+VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe
 
 !ELSEIF "$(MSVC_VARIANT)" == "MSVC2008"
-MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*
+MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(VCREDIST_DLL)\Microsoft.VC90.CRT\*.*
 
 !ELSE
 !ERROR MSVC_VARIANT unknown