diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-07-12 00:04:53 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-07-12 00:04:53 +0000 |
| commit | bdea70585d389c71846104bdd4534ab20bd2e9e2 (patch) | |
| tree | b9a0ec8cbe5eafbe51c78d9d2d34ae95d63fbbf2 /Makefile.nmake | |
| parent | c7c73e44b56459ed32ef8d70abf9a5d038dfab4f (diff) | |
Use win32_open_file in qtshark on Windows.
svn path=/trunk/; revision=43677
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index ac4c410ba5..69e44ff1b2 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -183,10 +183,11 @@ randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ EXECUTABLES=wireshark.exe tshark.exe rawshark.exe \ capinfos.exe editcap.exe mergecap.exe text2pcap.exe randpkt.exe dumpcap.exe -RESOURCES=image\wireshark.res image\libwireshark.res image\tshark.res \ - image\capinfos.res image\editcap.res image\mergecap.res \ - image\text2pcap.res image\wiretap.res image\dumpcap.res \ - image\rawshark.res image\libwsutil.res +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 \ + image\wiretap.res image\dumpcap.res image\rawshark.res \ + image\libwsutil.res all: $(LIBS_CHECK) config.h ui\qt\config.pri tools image codecs $(C_ARES_DLL) $(ADNS_DLL) $(ZLIB_DLL) wsutil wiretap epan $(EXECUTABLES) wireshark.bsc $(RESOURCES) doc help install-all @@ -286,10 +287,10 @@ $(RESOURCES): image wiretap\wiretap-$(WTAP_VERSION).lib: image $(ZLIB_DLL) wiretap -wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan gtk ui win32 image\wireshark.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib ui\libui.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib plugins +wireshark.exe : $(LIBS_CHECK) config.h $(wireshark_OBJECTS) codecs epan gtk ui win32 image\wireshark.res image\file_dlg_win32.res wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib codecs\codecs.lib ui\libui.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib plugins @echo Linking $@ $(LINK) @<< - /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK_LIBS) codecs\codecs.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib ui\libui.lib $(wireshark_OBJECTS) image\wireshark.res + /OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK_LIBS) codecs\codecs.lib ui\gtk\libgtkui.lib ui\win32\libgtkui_win32.lib ui\libui.lib $(wireshark_OBJECTS) image\wireshark.res image\file_dlg_win32.res << !IFDEF MANIFEST_INFO_REQUIRED mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:wireshark.exe;1 |