diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-09-17 21:54:52 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-09-17 21:54:52 +0000 |
| commit | 76a108ab01346efe3f6109a5ad5723730059b5cb (patch) | |
| tree | 49a25456a871434b7e9ca3c8909e9feec1c50e60 /Makefile.nmake | |
| parent | df321b5c5c8e2873dd93f1a7111347eb2653d5a0 (diff) | |
Install the CRT DLLs using the Visual C++ Redistributable Package
(vcredist_x64.exe) on Win64. This should fix bug 4024.
svn path=/trunk/; revision=29977
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 81c9d240fa..b7c3e8c6e4 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -227,7 +227,7 @@ packaging_zip: all xcopy "$(MSVCR_DLL)" $(INSTALL_DIR) !ENDIF !IFDEF VCREDIST_EXE - @echo Including vcredist_x86.exe -- your recipient may need to run it! + @echo Including vcredist_$(TARGET_MACHINE).exe -- your recipient may need to run it! xcopy "$(VCREDIST_EXE)" $(INSTALL_DIR) !ENDIF rm -f wireshark.zip @@ -923,7 +923,7 @@ debug-dumpcap: dumpcap.exe install-generated-files install-generated-files: set copycmd=/y if not exist $(INSTALL_DIR) mkdir $(INSTALL_DIR) -!IF "$(MSVC_VARIANT)" == "MSVC2008" +!IF DEFINED (MSVCR_DLL) && "$(MSVC_VARIANT)" == "MSVC2008" xcopy "$(MSVCR_DLL)" $(INSTALL_DIR)\*.* /d !ENDIF !IFDEF ENABLE_LIBWIRESHARK |