diff options
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | ui/qt/QtShark.pro | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 9d4e557010..988fa58836 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -425,6 +425,7 @@ ui\qt\config.pri: config.nmake Makefile.nmake # qmake apparently requires a three-part numeric VERSION. VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO) VERSION_FULL = $(VERSION) +WTAP_VERSION = $(WTAP_VERSION) !IFDEF MANIFEST_INFO_REQUIRED CONFIG += wireshark_manifest_info_required !ENDIF diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index 40bc3dbb77..69617c9122 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -253,12 +253,12 @@ win32 { LIBS += $$PA_OBJECTS LIBS += \ wsock32.lib user32.lib shell32.lib comctl32.lib \ - -L../../epan -llibwireshark -L../../wsutil -llibwsutil -L../../wiretap -lwiretap-1.7.0 \ + -L../../epan -llibwireshark -L../../wsutil -llibwsutil -L../../wiretap -lwiretap-$${WTAP_VERSION} \ -L$${GLIB_DIR}/lib -lglib-2.0 -lgmodule-2.0 EXTRA_BINFILES = \ ../../dumpcap.exe \ - ../../epan/libwireshark.dll ../../wiretap/wiretap-1.7.0.dll ../../wsutil/libwsutil.dll \ + ../../epan/libwireshark.dll ../../wiretap/wiretap-$${WTAP_VERSION}.dll ../../wsutil/libwsutil.dll \ $${GLIB_DIR}/bin/libglib-2.0-0.dll $${GLIB_DIR}/bin/libgmodule-2.0-0.dll \ $${GLIB_DIR}/bin/libgthread-2.0-0.dll $${GLIB_DIR}/bin/$${INTL_DLL} \ $${C_ARES_DIR}/bin/libcares-2.dll $${ZLIB_DIR}/zlib1.dll \ |