summaryrefslogtreecommitdiff
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2015-10-07 23:27:17 +0200
committerAnders Broman <a.broman58@gmail.com>2015-10-08 04:18:39 +0000
commit7d252d4b55e06d577f56f2169a757e81276dba7b (patch)
treed1308732241337f459dcc48be54e7db93986ebeb /Makefile.nmake
parent291bca0056f0f3c6d3bcd232991cec66d79b17f2 (diff)
downloadwireshark-7d252d4b55e06d577f56f2169a757e81276dba7b.tar.gz
Add USBPcap 1.1.0.0-g794bf26 to Windows installer
Change-Id: Idb88cd41436e49b7a29bd4a8e896c92d8489318d Reviewed-on: https://code.wireshark.org/review/10868 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index 86fcf8f8e7..3af830144c 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1112,6 +1112,10 @@ process_libs:
nasm-2.09.08-win32.zip \
"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
!ENDIF
+ @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
+ . \
+ USBPcapSetup-1.1.0.0-g794bf26.exe \
+ "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
!IF "$(WIN_SETUP_OPT)" == "--download"
@$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIB_DIR)" "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
!ENDIF