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 /packaging | |
| 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 'packaging')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 8f2770ca59..b37f503b94 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -426,7 +426,15 @@ File "..\..\ipmap.html" !ifdef VCREDIST_EXE ; vcredist_x86.exe (MSVC V8) - copy and execute the redistributable installer File "${VCREDIST_EXE}" +!if ${WIRESHARK_TARGET_PLATFORM} == "win32" ExecWait '"$INSTDIR\vcredist_x86.exe"' $0 +!else +; If the user already has the redistributable installed they will see a +; Big Ugly Dialog by default, asking if they want to uninstall or repair. +; Ideally we should add a checkbox for this somewhere. In the meantime, +; just do a silent install. +ExecWait '"$INSTDIR\vcredist_x64.exe" /q' $0 +!endif ; WIRESHARK_TARGET_PLATFORM DetailPrint "vcredist_x86 returned $0" !else !ifdef MSVCR_DLL |