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

Pass WTAP_VERSION to Qt. (WTAP_VERSION should probably match the GNU 

toolchain version but that's a separate issue.)

svn path=/trunk/; revision=43124
This commit is contained in:
Gerald Combs 2012-06-05 18:37:32 +00:00
parent f1cf70fc10
commit 95e53ff7ab
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.nmake
View File

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

4
ui/qt/QtShark.pro
View File

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