diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-01-28 00:21:05 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-01-28 00:21:05 +0000 |
| commit | 39582e8f3bcfda313459cbb65e7bc1ecec402ed8 (patch) | |
| tree | 7853ee0fb3c3c2e7117762f10e43e251b31ae3bc /config.nmake | |
| parent | f434c672383852a934434bc02492ea6d41ea8f55 (diff) | |
Use the correct processor architecture in our manifest. This lets us
create a usable wireshark.exe for x64 using Visual C++ 10. Change the
name of VCREDIST_DLL to PROCESSOR_ARCHITECTURE to more accurately
reflect what it's used for. Allow MSVC_VARIANT to be set from the
system environment, mainly to keep me from accidentally clobbering it
in the future.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@35687 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/config.nmake b/config.nmake index 7405cbc24b..db71cb3370 100644 --- a/config.nmake +++ b/config.nmake @@ -55,21 +55,23 @@ TOOLS_DIR=tools # TARGET_MACHINE (Used for link /MACHINE) should be one of "X86" or "X64" # (sorry ARM, Alpha, MIPS, and Itanium fans). # CPU (Used by win32.mak) should be one of "i386" or "AMD64". +# PROCESSOR_ARCHITECTURE (Used for redistributable packages and +# manifests) should be one of "x86" or "amd64". !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" TARGET_MACHINE=x86 CPU=i386 -VCREDIST_DLL=x86 +PROCESSOR_ARCHITECTURE=x86 !else if "$(WIRESHARK_TARGET_PLATFORM)" == "win64" TARGET_MACHINE=x64 CPU=AMD64 -VCREDIST_DLL=amd64 +PROCESSOR_ARCHITECTURE=amd64 !else !error Your mysterious moon-man architecture "$(WIRESHARK_TARGET_PLATFORM)" frightens and confuses us. !endif ##### Microsoft Visual C / Studio Variant ##### -# for the different Studios, see: http://en.wikipedia.org/wiki/Microsoft_Visual_Studio +# For the different Studios, see: http://en.wikipedia.org/wiki/Microsoft_Visual_Studio # only one of the following MSVC_VARIANT settings should be used # BTW: The "Microsoft Visual C++ Toolkit 2003" DOESN'T WORK for WS! @@ -111,7 +113,7 @@ VCREDIST_DLL=amd64 # "Microsoft Visual Studio 2008" # Visual C++ 9.0, _MSC_VER 1500, msvcr90.dll -MSVC_VARIANT=MSVC2008 +#MSVC_VARIANT=MSVC2008 # "Microsoft Visual C++ 2008 Express Edition" # Visual C++ 9.0, _MSC_VER 1500, msvcr90.dll @@ -125,6 +127,12 @@ MSVC_VARIANT=MSVC2008 # Visual C++ 10.0, _MSC_VER 1600, msvcr100.dll #MSVC_VARIANT=MSVC2010EE +# The default if we haven't set a system environment variable or +# uncommented an entry above. +!IFNDEF MSVC_VARIANT +MSVC_VARIANT=MSVC2008 +!ENDIF + # # Optional: To compile some time critical code from assembler instead of C # @@ -863,7 +871,7 @@ 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\$(VCREDIST_DLL)\Microsoft.VC80.CRT\*.* +MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\$(PROCESSOR_ARCHITECTURE)\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, @@ -871,7 +879,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\$(VCREDIST_DLL)\M VCREDIST_EXE=$(WIRESHARK_LIBS)\vcredist_$(TARGET_MACHINE).exe !ELSEIF "$(MSVC_VARIANT)" == "MSVC2008" -MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(VCREDIST_DLL)\Microsoft.VC90.CRT\*.* +MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC90.CRT\*.* !ELSEIF "$(MSVC_VARIANT)" == "MSVC2010EE" # you need to download the redistributable package vcredist_x86.exe from Microsoft first, |