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

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
This commit is contained in:
Anders Broman 2013-10-07 04:49:44 +00:00
parent 6013cbd4f5
commit 1394b21b88
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.nmake
View File

@ -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