osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Use the CRT version appropriate for our target architecture. 

svn path=/trunk/; revision=28079
This commit is contained in:
Gerald Combs 2009-04-17 19:02:56 +00:00
parent 28276f43d0
commit 2739bf8819
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config.nmake
View File

@ -56,11 +56,13 @@ TOOLS_DIR=tools
# (sorry ARM, Alpha, MIPS, and Itanium fans). # (sorry ARM, Alpha, MIPS, and Itanium fans).
# CPU (Used by win32.mak) should be one of "i386" or "AMD64". # CPU (Used by win32.mak) should be one of "i386" or "AMD64".
!if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
TARGET_MACHINE=X86 TARGET_MACHINE=x86
CPU=i386 CPU=i386
VCREDIST_DLL=x86
!else if "$(WIRESHARK_TARGET_PLATFORM)" == "win64" !else if "$(WIRESHARK_TARGET_PLATFORM)" == "win64"
TARGET_MACHINE=X64 TARGET_MACHINE=x64
CPU=AMD64 CPU=AMD64
VCREDIST_DLL=amd64
!else !else
!error Your mysterious moon-man architecture "$(WIRESHARK_TARGET_PLATFORM)" frightens and confuses us. !error Your mysterious moon-man architecture "$(WIRESHARK_TARGET_PLATFORM)" frightens and confuses us.
!endif !endif
@ -797,15 +799,15 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio .NET 2003\Visual Studio .NET
# no redistributable available for this package! # no redistributable available for this package!
!ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" !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" !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE"
# you need to download the redistributable package vcredist_x86.exe from Microsoft first, # you need to download the redistributable package vcredist_x86.exe from Microsoft first,
# and copy it to the lib folder!!! # 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" !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 !ELSE
!ERROR MSVC_VARIANT unknown !ERROR MSVC_VARIANT unknown