diff options
| author | Dmitry Bazhenov <dima_b@pigeonpoint.com> | 2015-02-27 10:31:32 +0500 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2015-02-27 16:08:05 +0000 |
| commit | 2462c0d35a113043b003a73b8b3fe31a674264bb (patch) | |
| tree | 388b61e80d255a334fc05e5b69d87a1aaca101ed | |
| parent | e4afcc83db9cd0946e82a65d56adf4e8a9416881 (diff) | |
Use VCINSTALLDIR environment variable in order to locate MSVCR_DLL.
This fixes Windows build in cases when MSVS is installed in non-default
directory.
Change-Id: I9cfa3f728d64e9d5952c68b2b2b70e627d3f5c3e
Reviewed-on: https://code.wireshark.org/review/7426
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
| -rw-r--r-- | config.nmake | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/config.nmake b/config.nmake index b9e9e217d1..33d897f55d 100644 --- a/config.nmake +++ b/config.nmake @@ -1191,7 +1191,7 @@ VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe # a portable version work, as the C runtime doesn't have to be # installed on the target machine. # -MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 8\VC\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC80.CRT\*.* +MSVCR_DLL=$(VCINSTALLDIR)\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC80.CRT\*.* !ELSEIF "$(MSVC_VARIANT)" == "MSVC2005EE" || "$(MSVC_VARIANT)" == "DOTNET20" || "$(MSVC_VARIANT)" == "MSVC2008EE" # @@ -1215,7 +1215,7 @@ VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe # a portable version work, as the C runtime doesn't have to be # installed on the target machine. # -MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC90.CRT\*.* +MSVCR_DLL=$(VCINSTALLDIR)\redist\$(PROCESSOR_ARCHITECTURE)\Microsoft.VC90.CRT\*.* !ELSEIF "$(MSVC_VARIANT)" == "MSVC2010EE" # @@ -1227,6 +1227,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 9.0\VC\redist\$(PROCESSOR_ARC # vcredist_x86.exe or vcredist_x64.exe, from Microsoft first, and copy # it to the lib folder!!! VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe + !ELSEIF "$(MSVC_VARIANT)" == "MSVC2010" # # For MSVC 2010 non-Express Edition, we "Install a particular Visual C++ @@ -1241,7 +1242,7 @@ VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe # C++ assembly as a private assembly for the application", starting # with Visual Studio 2010. # -MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.* +MSVCR_DLL=$(VCINSTALLDIR)\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.* !ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" # # EE version added as per bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227 @@ -1258,7 +1259,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHI # C++ assembly as a private assembly for the application", starting # with Visual Studio 2010. # -MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 11.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC110.CRT\*.* +MSVCR_DLL=$(VCINSTALLDIR)\redist\$(TARGET_MACHINE)\Microsoft.VC110.CRT\*.* !ELSEIF "$(MSVC_VARIANT)" == "MSVC2013" || "$(MSVC_VARIANT)" == "MSVC2013EE" # # EE version added as per bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227 @@ -1275,7 +1276,7 @@ MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 11.0\VC\redist\$(TARGET_MACHI # C++ assembly as a private assembly for the application", starting # with Visual Studio 2010. # -MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 12.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC120.CRT\*.* +MSVCR_DLL=$(VCINSTALLDIR)\redist\$(TARGET_MACHINE)\Microsoft.VC120.CRT\*.* !ELSE !ERROR MSVC_VARIANT unknown !ENDIF |