diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-10-07 04:49:44 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-10-07 04:49:44 +0000 |
| commit | 1394b21b88d7c3a7de44748cf59aeb4d417e6a8b (patch) | |
| tree | ff17fdc2c0f2a1582597749c271840a3d024ba2d /config.nmake | |
| parent | 6013cbd4f5e1a6162b61c7e10c5305a357369498 (diff) | |
Try to fix Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227 "Fix build for VS 2012 (MSVC_VARIANT==MSVC2012EE)"
svn path=/trunk/; revision=52433
Diffstat (limited to 'config.nmake')
| -rw-r--r-- | config.nmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake index 95d00105f3..3cca0fbb2b 100644 --- a/config.nmake +++ b/config.nmake @@ -1073,9 +1073,11 @@ VCREDIST_EXE=$(VCREDIST_DIR)\vcredist_$(TARGET_MACHINE).exe # with Visual Studio 2010. # MSVCR_DLL=$(PROGRAM_FILES)\Microsoft Visual Studio 10.0\VC\redist\$(TARGET_MACHINE)\Microsoft.VC100.CRT\*.* -!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" +!ELSEIF "$(MSVC_VARIANT)" == "MSVC2012" || "$(MSVC_VARIANT)" == "MSVC2012EE" # -# For MSVC 2012 non-Express Edition, we "Install a particular Visual C++ +# EE version added as per bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9227 +# +# For MSVC 2012, we "Install a particular Visual C++ # assembly as a private assembly for the application", by copying # the contents of the Microsoft.VC110.CRT folder to the target directory. # This is done to reduce the size of the installer; it also makes |