diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-09-24 22:57:54 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-09-24 22:57:54 +0000 |
| commit | 878f93804fb07f96628b8748bb0255cae30b75fb (patch) | |
| tree | 8b0d7e8a941029c21f416e6fa2027e79fa3eea37 /config.nmake | |
| parent | 196dbce3d2109ce24d30bcd154a0a6273666345f (diff) | |
Look in $(WIRESHARK_LIB_DIR)\vcredist_$(MSVC_VARIANT) for
the MSVC redistributable package, then look in the top-level
$(WIRESHARK_LIB_DIR). This lets us more easily use multiple compilers
with the same library directory.
svn path=/trunk/; revision=45113
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/config.nmake b/config.nmake index f07d61eee3..a3b6f1210a 100644 --- a/config.nmake +++ b/config.nmake @@ -912,10 +912,20 @@ INSTALL_DIR=wireshark-gtk2 # packages, the following will use the default paths depending # on the package version. # + +# You can either place the redistributable in its own platform- +# and compiler-specific directory or in the top-level library +# directory. +!IF EXIST("$(WIRESHARK_LIB_DIR)\vcredist_$(MSVC_VARIANT)") +VCREDIST_DIR=$(WIRESHARK_LIB_DIR)\vcredist_$(MSVC_VARIANT) +!ELSE +VCREDIST_DIR=$(WIRESHARK_LIB_DIR) +!ENDIF + !IF "$(WIRESHARK_TARGET_PLATFORM)" == "win64" # We're not creating portable packages and therefore don't have to worry about # "deploying using xcopy" -VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe +VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005" MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC80.CRT\*.* @@ -923,7 +933,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\$(PROCESSOR_ARCHI !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_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe +VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe !ELSEIF "$(MSVC_VARIANT)" == "MSVC2008" MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC90.CRT\*.* @@ -931,7 +941,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARC !ELSEIF "$(MSVC_VARIANT)" == "MSVC2010EE" # you need to download the redistributable package vcredist_x86.exe from Microsoft first, # and copy it to the lib folder!!! -VCREDIST_EXE=$(WIRESHARK_LIB_DIR)\vcredist_$(TARGET_MACHINE).exe +VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe !ELSEIF "$(MSVC_VARIANT)" == "MSVC2010" MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.* !ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" |