PLATFORM_SRC = capture-wpcap.c capture_wpcap_packet.c capture_win_ifnames.c
-WTAP_PLUGIN_SOURCES = \
- epan/plugins.c \
- epan/report_err.c \
- epan/filesystem.c
-
include Makefile.common
-wireshark_OBJECTS = $(wireshark_SOURCES:.c=.obj)
+wireshark_OBJECTS = $(WIRESHARK_COMMON_SRC:.c=.obj)
tshark_OBJECTS = $(tshark_SOURCES:.c=.obj)
rawshark_OBJECTS = $(rawshark_SOURCES:.c=.obj)
###text2pcap_OBJECTS = $(text2pcap_SOURCES:.c=.obj)
-###mergecap_OBJECTS = $(mergecap_SOURCES:.c=.obj)
+mergecap_OBJECTS = $(mergecap_SOURCES:.c=.obj)
editcap_OBJECTS = $(editcap_SOURCES:.c=.obj)
capinfos_OBJECTS = $(capinfos_SOURCES:.c=.obj)
dftest_OBJECTS = $(dftest_SOURCES:.c=.obj)
dumpcap_OBJECTS = $(dumpcap_SOURCES:.c=.obj)
randpkt_OBJECTS = $(randpkt_SOURCES:.c=.obj)
+#
+# psapi.lib see http://msdn.microsoft.com/en-us/library/windows/desktop/ms683219(v=vs.85).aspx
+#
+
wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
- wsock32.lib user32.lib shell32.lib comctl32.lib ole32.lib \
+ wsock32.lib user32.lib shell32.lib comctl32.lib ole32.lib psapi.lib \
$(GTHREAD_LIBS) \
$(HHC_LIBS) \
wsutil\libwsutil.lib \
$(GNUTLS_LIBS) \
$(PYTHON_LIBS) \
- $(ZLIB_LIBS) \
$(WINSPARKLE_LIBS) \
!IFDEF ENABLE_LIBWIRESHARK
epan\libwireshark.lib \
epan\dfilter\dfilter.lib \
epan\ftypes\ftypes.lib \
$(C_ARES_LIBS) \
- $(ADNS_LIBS)
+ $(ADNS_LIBS) \
+ $(ZLIB_LIBS)
!ENDIF
tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
- wsock32.lib user32.lib \
+ wsock32.lib user32.lib psapi.lib \
$(GLIB_LIBS) \
$(GTHREAD_LIBS) \
wsutil\libwsutil.lib \
!ENDIF
rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
- wsock32.lib user32.lib \
+ wsock32.lib user32.lib psapi.lib \
$(GLIB_LIBS) \
wsutil\libwsutil.lib \
$(GNUTLS_LIBS) \
$(GTHREAD_LIBS)
dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
- wsock32.lib user32.lib \
+ wsock32.lib user32.lib psapi.lib \
$(GLIB_LIBS) \
wsutil\libwsutil.lib \
$(GNUTLS_LIBS) \
$(GLIB_LIBS)
EXECUTABLES=wireshark.exe tshark.exe rawshark.exe \
- capinfos.exe editcap.exe mergecap.exe text2pcap.exe randpkt.exe reordercap.exe dumpcap.exe
+ capinfos.exe editcap.exe mergecap.exe text2pcap.exe randpkt.exe \
+ reordercap.exe dumpcap.exe dftest.exe
+
+!IFDEF QT5_BASE_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\reordercap.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
+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) help install-all
!IFDEF MAKENSIS
packaging: all
cd packaging
cd nsis
- $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..
cd ..
!ELSE
@exit 1
!ENDIF
-packaging_u3: all
- cd packaging
- cd u3
- cd win32
- $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
- cd ..
- cd ..
- cd ..
-
packaging_papps: all
cd packaging
cd portableapps
cd win32
- $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
+ $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..
cd ..
cd ..
mt.exe -nologo -manifest "wireshark.exe.manifest" -outputresource:$(PROGRAM_NAME).exe;1
!ENDIF
+qtshark.exe : install-generated-files $(LIBS_CHECK) config.h 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) @<<
!ENDIF
# Linking with setargv.obj enables "wildcard expansion" of command-line arguments
-mergecap.exe : $(LIBS_CHECK) config.h mergecap.obj merge.obj wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res
+mergecap.exe : $(LIBS_CHECK) config.h $(mergecap_OBJECTS) wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\mergecap.res
@echo Linking $@
$(LINK) @<<
- /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) mergecap.obj merge.obj $(mergecap_LIBS) setargv.obj image\mergecap.res
+ /OUT:mergecap.exe $(conflags) $(conlibsdll) $(LDFLAGS) $(mergecap_OBJECTS) $(mergecap_LIBS) image\mergecap.res
<<
!IFDEF MANIFEST_INFO_REQUIRED
mt.exe -nologo -manifest "mergecap.exe.manifest" -outputresource:mergecap.exe;1
-e s/@VERSION_MICRO@/$(VERSION_MICRO)/ \
-e "s/@HAVE_C_ARES@/$(C_ARES_CONFIG)/" \
-e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \
- -e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \
+ -e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \
-e "s/@HAVE_NETTLE@/$(NETTLE_CONFIG)/" \
-e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \
-e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \
SMI_DIR = $(SMI_DIR:\=/)
KFW_DIR = $(KFW_DIR:\=/)
LUA_DIR = $(LUA_DIR:\=/)
-PORTAUDIO_DIR = $(PORTAUDIO_DIR:\=/)
GEOIP_DIR = $(GEOIP_DIR:\=/)
WINSPARKLE_DIR = $(WINSPARKLE_DIR:\=/)
HHC_LIBS = $(HHC_LIBS)
+SH = $(SH)
+PYTHON = $(PYTHON)
+
MSVC_VARIANT = $(MSVC_VARIANT)
MSVCR_DLL = "$(MSVCR_DLL:\=/)"
-QMAKE_CFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/)
-QMAKE_CXXFLAGS *= $(STANDARD_CFLAGS) $(PORTAUDIO_CFLAGS:\=/)
+QMAKE_CFLAGS *= $(STANDARD_CFLAGS)
+# NOMINMAX keeps windows.h from defining "min" and "max" via windef.h.
+# This avoids conflicts with the C++ standard library.
+QMAKE_CXXFLAGS *= $(STANDARD_CFLAGS) /DNOMINMAX
QMAKE_LFLAGS *= /LARGEADDRESSAWARE $(LDFLAGS)
<<KEEP
-ps.c: tools\rdps.py print.ps
- $(PYTHON) tools\rdps.py print.ps ps.c
#
# Build the version string
#
clean-local:
rm -f $(wireshark_OBJECTS) $(tshark_OBJECTS) $(dumpcap_OBJECTS) $(rawshark_OBJECTS) \
- $(EXECUTABLES) *.pdb *.sbr *.exe.manifest \
- capinfos.obj capinfos.exp editcap.obj editcap.exp \
+ $(EXECUTABLES) *.pdb *.sbr *.exe.manifest \
+ capinfos.obj capinfos.exp capinfos.lib editcap.obj editcap.exp editcap.lib \
mergecap.obj text2pcap.obj \
reordercap.obj nio-ie5.obj update.obj \
- text2pcap-scanner.obj text2pcap-scanner.c rdps.obj \
- rdps.pdb rdps.exe rdps.ilk config.h ps.c $(LIBS_CHECK) \
- dftest.obj dftest.exe randpkt.obj randpkt.ext \
+ text2pcap-scanner.obj text2pcap-scanner.c \
+ config.h ps.c $(LIBS_CHECK) \
+ dftest.obj dftest.exe randpkt.obj randpkt.exe \
doxygen.cfg \
$(RESOURCES) libwireshark.dll wiretap-$(WTAP_VERSION).dll \
libwsutil.dll \
wireshark.bsc
rm -rf $(INSTALL_DIR)
+ rm -rf wireshark-qt-release
clean: clean-local
cd asn1
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd gtk
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+!IFDEF QT5_BASE_DIR
+ cd ../qt
+ -$(MAKE) clean
+!ENDIF
cd ../win32
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../cli
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../packaging/nsis
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
- cd ../u3/win32
- $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
- cd ../../portableapps/win32
+ cd ../portableapps/win32
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../../..
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd gtk
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+!IFDEF QT5_BASE_DIR
+ cd ../qt
+ -$(MAKE) distclean
+!ENDIF
cd ../win32
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../cli
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../packaging/nsis
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
- cd ../u3/win32
- $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
- cd ../../portableapps/win32
+ cd ../portableapps/win32
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../../..
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd gtk
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+!IFDEF QT5_BASE_DIR
+ cd ../qt
+ -$(MAKE) distclean
+!ENDIF
cd ../win32
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../cli
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../packaging/nsis
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
- cd ../u3/win32
- $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
- cd ../../portableapps/win32
+ cd ../portableapps/win32
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../../..
$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui.lib
cd ../..
+# The Visual C++ static analyzer currently fails with error C2171
+# when compiling summary_dialog.cpp. If/when this ever gets fixed
+# we can remove the ENABLE_CODE_ANALYSIS check.
+qt:: help config.h svnversion.h doxygen
+!IFDEF QT5_BASE_DIR
+ cd ui/qt
+ $(QT5_BASE_DIR)\bin\qmake CONFIG+=release QtShark.pro
+!IFDEF ENABLE_CODE_ANALYSIS
+ -nmake
+!ELSE
+ nmake
+!ENDIF
+ cd ../..
+!ENDIF
+
win32::
cd ui/win32
$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libgtkui_win32.lib
doxygen: doxygen.cfg doxygen-run
-services: tools\make-services.pl
- $(PERL) tools/make-services.pl
+services: tools\make-services.py
+ $(PYTHON) tools/make-services.py
################################################################################
# Prepare build environment by downloading and installing required libraries
env \
grep \
--cygwinonly /usr/bin/find \
- peflags \
+ peflags \
$(PERL) \
$(PYTHON) \
+!IFDEF QT5_BASE_DIR
+ --windowsonly $(QT5_BASE_DIR)\bin\qmake \
+!ENDIF
sed \
unzip \
wget
# contain old files remaining from a previous setup run.
setup: verify_tools clean_setup process_libs
-
+install_qt:
+ $(SH) $(WIN_SETUP) --download "C:\Qt" \
+ . Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws.zip
+
# The process_libs target when invoked causes either a --libverify or a --download for all the required libraries.
# (The choice is determined by the value of the macro WIN_SETUP_OPT).
process_libs:
@if not exist "$(WIRESHARK_LIB_DIR)" md "$(WIRESHARK_LIB_DIR)"
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
- . WinPcap_$(PCAP_VERSION).exe
+ . WinPcap_$(WINPCAP_VERSION).exe
+!IFNDEF QT5_BASE_DIR
+!MESSAGE Can't find Qt. This will become a problem at some point.
+!ENDIF
!IFDEF GTK_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
"$(GTK_NAME)" gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM)$(PKG_SUFIX).zip
!ENDIF
!IFDEF HHC_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
- user-guide user-guide-46501.zip
+ user-guide user-guide-52567.zip
!ENDIF
!IFDEF UPX
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
# WHEN UPDATING LIBRARY VERSIONS, KEEP ALSO ONE FORMER VERSION SO
# UPDATING REMOVES THE FORMER USER DIRS
clean_setup:
- cd "$(WIRESHARK_LIB_DIR)"
- rm -r -f adns-1.0-win32-05ws
- rm -r -f c-ares-1.5.3ws
- rm -r -f c-ares-1.6.0ws
- rm -r -f c-ares-1.7.0-win??ws
- rm -r -f c-ares-1.7.1-win??ws
- rm -r -f c-ares-1.9.1-win??ws
- rm -r -f gettext-0.14.5
- rm -r -f gettext-runtime-0.17
- rm -r -f gettext-runtime-0.17-1
- rm -r -f gettext-0.17-1 # win64
- rm -r -f glib
- rm -r -f gnutls-2.8.1-1
- rm -r -f gnutls-2.8.5-*-win??ws
- rm -r -f gnutls-2.10.3-*-win??ws
- rm -r -f gnutls-2.12.18-*-win??ws
+ cd "$(WIRESHARK_LIB_DIR)"
+ rm -r -f adns-1.0-win32-05ws
+ rm -r -f c-ares-1.5.3ws
+ rm -r -f c-ares-1.6.0ws
+ rm -r -f c-ares-1.7.0-win??ws
+ rm -r -f c-ares-1.7.1-win??ws
+ rm -r -f c-ares-1.9.1-1-win??ws
+ rm -r -f gettext-0.14.5
+ rm -r -f gettext-runtime-0.17
+ rm -r -f gettext-runtime-0.17-1
+ rm -r -f gettext-0.17-1 # win64
+ rm -r -f glib
+ rm -r -f gnutls-2.8.1-1
+ rm -r -f gnutls-2.8.5-*-win??ws
+ rm -r -f gnutls-2.10.3-*-win??ws
+ rm -r -f gnutls-2.12.18-*-win??ws
!IF "$(GTK_NAME)" == "gtk2"
- rm -r -f gtk2
+ rm -r -f gtk2
!ELSE
- rm -r -f gtk3
-!ENDIF
- rm -r -f gtk+
- rm -r -f gtk-wimp
- rm -r -f kfw-2.5
- rm -r -f kfw-3-2-2-final
- rm -r -f kfw-3.2.2-ws1
- rm -r -f kfw-3-2-2-i386-ws-vc6
- rm -r -f libiconv-1.9.1.bin.woe32
- rm -r -f lua5.1
- rm -r -f lua5.1.4
- rm -r -f libsmi-0.4.5
- rm -r -f libsmi-0.4.8
- rm -r -f libsmi-svn-40773-win??ws
- rm -r -f nasm-2.00
- rm -r -f nasm-2.02
- rm -r -f nasm-2.09.08
- rm -r -f pcre-6.4
- rm -r -f pcre-7.0
- rm -r -f portaudio_v19
- rm -r -f portaudio_v19_2
- rm -r -f upx301w
- rm -r -f upx303w
- rm -r -f user-guide
- rm -r -f zlib123
- rm -r -f zlib125
- rm -r -f zlib-1.2.5
- rm -r -f zlib123-dll
- rm -r -f AirPcap_Devpack_1_0_0_594
- rm -r -f AirPcap_Devpack_4_0_0_1480
- rm -r -f AirPcap_Devpack_4_1_0_1622
- rm -r -f GeoIP-1.4.5ws
- rm -r -f GeoIP-1.4.6-win??ws
- rm -r -f GeoIP-1.4.8-win??ws
- rm -r -f GeoIP-1.4.8-*-win??ws
- rm -r -f WinSparkle-0.3-44-g2c8d9d3-win??ws
- rm -r -f WpdPack
- cd "$(MAKEDIR)"
+ rm -r -f gtk3
+!ENDIF
+ rm -r -f gtk+
+ rm -r -f gtk-wimp
+ rm -r -f kfw-2.5
+ rm -r -f kfw-3-2-2-final
+ rm -r -f kfw-3.2.2-ws1
+ rm -r -f kfw-3-2-2-i386-ws-vc6
+ rm -r -f libiconv-1.9.1.bin.woe32
+ rm -r -f lua5.1
+ rm -r -f lua5.1.4
+ rm -r -f libsmi-0.4.5
+ rm -r -f libsmi-0.4.8
+ rm -r -f libsmi-svn-40773-win??ws
+ rm -r -f nasm-2.00
+ rm -r -f nasm-2.02
+ rm -r -f nasm-2.09.08
+ rm -r -f pcre-6.4
+ rm -r -f pcre-7.0
+ rm -r -f portaudio_v19
+ rm -r -f portaudio_v19_2
+ rm -r -f upx301w
+ rm -r -f upx303w
+ rm -r -f user-guide
+ rm -r -f zlib123
+ rm -r -f zlib125
+ rm -r -f zlib-1.2.5
+ rm -r -f zlib123-dll
+ rm -r -f AirPcap_Devpack_1_0_0_594
+ rm -r -f AirPcap_Devpack_4_0_0_1480
+ rm -r -f AirPcap_Devpack_4_1_0_1622
+ rm -r -f GeoIP-1.4.5ws
+ rm -r -f GeoIP-1.4.6-win??ws
+ rm -r -f GeoIP-1.4.8-win??ws
+ rm -r -f GeoIP-1.4.8-*-win??ws
+ rm -r -f GeoIP-1.5.1-*-win??ws
+ rm -r -f WinSparkle-0.3-44-g2c8d9d3-win??ws
+ rm -r -f WpdPack
+ cd "$(MAKEDIR)"
################################################################################
# Prepare the debug trees for running Wireshark/Tshark from there.
# install generated files (exe, "our" libs, ...)
-install-generated-files:
+install-generated-files: doc
set copycmd=/y
if not exist $(INSTALL_DIR) mkdir $(INSTALL_DIR)
!IF DEFINED (MSVCR_DLL) && "$(MSVC_VARIANT)" == "MSVC2008"
cd plugins
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-plugins
cd ..
+ if not exist $(INSTALL_DIR)\profiles mkdir $(INSTALL_DIR)\profiles
+ if not exist $(INSTALL_DIR)\profiles\Bluetooth mkdir $(INSTALL_DIR)\profiles\Bluetooth
+ xcopy ".\profiles\Bluetooth\colorfilters" $(INSTALL_DIR)\profiles\Bluetooth /d
+ if not exist $(INSTALL_DIR)\profiles\Classic mkdir $(INSTALL_DIR)\profiles\Classic
+ xcopy ".\profiles\Classic\colorfilters" $(INSTALL_DIR)\profiles\Classic /d
# "install-all" will copy all files needed to run Wireshark/Tshark
# to the INSTALL_DIR, so you can run/debug Wireshark/Tshark from there.
checkapi_local:
$(PERL) tools/checkAPIs.pl -build \
- $(wireshark_SOURCES) \
+ $(WIRESHARK_COMMON_SRC) \
$(TSHARK_TAP_SRC) \
# $(EXTRA_wireshark_SOURCES)
git.samba.org / metze / wireshark / wip.git / blobdiff