diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-08 23:03:56 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-08 23:03:56 +0000 |
| commit | b3c844fa64680175bf0fe6a6f731d0a9f9eec113 (patch) | |
| tree | 33660e9b9f9446bc8a1ed8f1c1e79195418d22ef /Makefile.nmake | |
| parent | 69da562c83e58c9bf71775ab492219534ee459cc (diff) | |
| download | wireshark-b3c844fa64680175bf0fe6a6f731d0a9f9eec113.tar.gz wireshark-b3c844fa64680175bf0fe6a6f731d0a9f9eec113.tar.bz2 wireshark-b3c844fa64680175bf0fe6a6f731d0a9f9eec113.zip | |
Add an initial Qt configuration and makefile targets.
svn path=/trunk/; revision=52456
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index ad09fe9979..17528cee30 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -192,6 +192,10 @@ EXECUTABLES=wireshark.exe tshark.exe rawshark.exe \ capinfos.exe editcap.exe mergecap.exe text2pcap.exe randpkt.exe \ reordercap.exe dumpcap.exe dftest.exe +!IFDEF QT_DIR +EXECUTABLES=$(EXECUTABLES) qtshark.exe +!ENDIF + RESOURCES=image\wireshark.res image\file_dlg_win32.res \ image\libwireshark.res image\tshark.res image\capinfos.res \ image\editcap.res image\mergecap.res image\text2pcap.res \ @@ -309,6 +313,8 @@ wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan ui gtk w mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:$(PROGRAM_NAME).exe;1 !ENDIF +qtshark.exe : install-generated-files $(LIBS_CHECK) config.h $(tshark_OBJECTS) epan ui qt wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins + tshark.exe : $(LIBS_CHECK) config.h $(tshark_OBJECTS) epan ui cli image\tshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib plugins @echo Linking $@ $(LINK) @<< @@ -536,6 +542,7 @@ clean-local: libwsutil.dll \ wireshark.bsc rm -rf $(INSTALL_DIR) + rm -rf wireshark-qt-release clean: clean-local cd asn1 @@ -550,6 +557,8 @@ clean: clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean + cd ../qt + $(MAKE) clean cd ../win32 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean cd ../cli @@ -600,6 +609,8 @@ distclean: distclean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean + cd ../qt + $(MAKE) distclean cd ../win32 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean cd ../cli @@ -643,6 +654,8 @@ maintainer-clean: maintainer-clean-local $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd gtk $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean + cd ../qt + $(MAKE) distclean cd ../win32 $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean cd ../cli @@ -758,6 +771,12 @@ gtk:: help config.h svnversion.h doxygen $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui.lib cd ../.. +qt:: help config.h svnversion.h doxygen + cd ui/qt + $(QT_DIR)\bin\qmake CONFIG+=release QtShark.pro + nmake + cd ../.. + win32:: cd ui/win32 $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui_win32.lib |