diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-02-19 22:21:17 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-02-19 22:21:17 +0000 |
| commit | e48236a43635f9f0e695a25199bf3ab959774590 (patch) | |
| tree | c6438499bad89c7f47eda54dc4e5c9bd2bcadb89 /Makefile.nmake | |
| parent | 9736ff7cb5f2ba971202a3472707aa96380d16de (diff) | |
| download | wireshark-e48236a43635f9f0e695a25199bf3ab959774590.tar.gz | |
Add automatic software update checks for Win32 using WinSparkle. Add
preferences (currently hidden) to disable updates, set the update
frequency, and set the update "channel" (stable vs development). Add a
"Help" menu item to manually check for updates.
svn path=/trunk/; revision=47748
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index bf2b5888c7..507a925668 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -45,7 +45,7 @@ GENERATED_CFLAGS=\ /I. /Iwiretap $(GLIB_CFLAGS) \ $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \ $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(GNUTLS_CFLAGS) \ - $(PYTHON_CFLAGS) $(SMI_CFLAGS) $(GEOIP_CFLAGS) + $(PYTHON_CFLAGS) $(SMI_CFLAGS) $(GEOIP_CFLAGS) $(WINSPARKLE_CFLAGS) CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) @@ -80,6 +80,7 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ $(GNUTLS_LIBS) \ $(PYTHON_LIBS) \ $(ZLIB_LIBS) \ + $(WINSPARKLE_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK epan\libwireshark.lib \ !ELSE @@ -440,6 +441,7 @@ config.h : config.h.win32 config.nmake -e "s/@HAVE_SMI@/$(SMI_CONFIG)/" \ -e "s/@HAVE_GEOIP@/$(GEOIP_CONFIG)/" \ -e "s/@HAVE_GEOIP_V6@/$(GEOIP_V6_CONFIG)/" \ + -e "s/@HAVE_SOFTWARE_UPDATE@/$(WINSPARKLE_CONFIG)/" \ -e "s/@INET6@/$(INET6_CONFIG)/" \ -e "s/@HAVE_NTDDNDIS_H@/$(NTDDNDIS_CONFIG)/" \ -e "s/@PCAP_NG_DEFAULT@/$(PCAP_NG_DEFAULT)/" \ @@ -471,6 +473,7 @@ KFW_DIR = $(KFW_DIR:\=/) LUA_DIR = $(LUA_DIR:\=/) PORTAUDIO_DIR = $(PORTAUDIO_DIR:\=/) GEOIP_DIR = $(GEOIP_DIR:\=/) +WINSPARKLE_DIR = $(WINSPARKLE_DIR:\=/) INTL_DLL = $(INTL_DLL) @@ -939,6 +942,10 @@ process_libs: @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip !ENDIF +!IFDEF WINSPARKLE_DIR + @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ + . WinSparkle-$(WINSPARKLE_PKG).zip +!ENDIF !IFDEF HHC_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ user-guide user-guide-46501.zip @@ -1015,6 +1022,7 @@ clean_setup: 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)" @@ -1261,6 +1269,9 @@ install-all: install-generated-files !IFDEF GEOIP_DIR xcopy "$(GEOIP_DIR)\bin\libGeoip-1.dll" $(INSTALL_DIR) /d !ENDIF +!IFDEF WINSPARKLE_DIR + xcopy "$(WINSPARKLE_DIR)\WinSparkle.dll" $(INSTALL_DIR) /d +!ENDIF cd $(INSTALL_DIR) peflags --dynamicbase=true --nxcompat=true *.dll !IF "$(GTK_INST_VERSION)" == "3.4" |