diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-08-16 19:37:01 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-08-16 19:37:01 +0000 |
| commit | f2789cbb3435ec94881d3fd6f3a36f84504c65e9 (patch) | |
| tree | 454094fc34e176416a00003c37a5262538d4442a /ui | |
| parent | 1b8e41afab376900bc7275138d9dcb6d44da5fb1 (diff) | |
| download | wireshark-f2789cbb3435ec94881d3fd6f3a36f84504c65e9.tar.gz wireshark-f2789cbb3435ec94881d3fd6f3a36f84504c65e9.tar.bz2 wireshark-f2789cbb3435ec94881d3fd6f3a36f84504c65e9.zip | |
Copy over the C runtime DLLs if MSVCR_DLL is defined.
svn path=/trunk/; revision=44544
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/QtShark.pro | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index 3388751528..7834c38389 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -319,6 +319,10 @@ win32 { -L../../epan -llibwireshark -L../../wsutil -llibwsutil -L../../wiretap -lwiretap-$${WTAP_VERSION} \ -L$${GLIB_DIR}/lib -lglib-2.0 -lgmodule-2.0 + !isEmpty(MSVCR_DLL) { + EXTRA_BINFILES += \"$${MSVCR_DLL}\" + } + CONFIG(debug, debug|release) { EXTRA_BINFILES += \ $$QMAKE_LIBDIR_QT/QtCored4.dll \ |