diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-11-24 23:03:13 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-04-25 07:22:28 +0000 |
| commit | ae316e2d888e3204f08593c27b4c2360eff7f679 (patch) | |
| tree | 26baec1e2daaee3578b4ae8450831703c47c877a /Makefile.nmake | |
| parent | c3574ed4173917f6ad89f40ab0b0dc0b1ad5e62d (diff) | |
Compile sshdump and ciscodump for Windows
Use libSSH 0.7.2 compiled with MinGW(32|64) and linked with zlib and gcrypt support
Change-Id: I7c17d1ba3dd1890e2f83c119f5ea851834807e43
Reviewed-on: https://code.wireshark.org/review/12117
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.nmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 9cc31a0586..00c5b13515 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -819,7 +819,7 @@ randpkt_core:: help config.h version.h doxygen $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake librandpkt_core.lib cd .. -extcap:: +extcap:: writecap cd extcap $(MAKE) /$(MAKEFLAGS) /f Makefile.nmake all cd .. @@ -1077,8 +1077,8 @@ process_libs: !ENDIF !IFDEF LIBSSH_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - libssh-$(LIBSSH_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws \ - libssh-$(LIBSSH_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip \ + . \ + libssh-0.7.2-$(WIRESHARK_TARGET_PLATFORM)ws.zip \ "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" !ENDIF !IFDEF WINSPARKLE_DIR @@ -1155,6 +1155,7 @@ clean_setup: 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 libssh-0.7.2-win??ws rm -r -f nasm-2.00 rm -r -f nasm-2.02 rm -r -f nasm-2.09.08 @@ -1234,6 +1235,8 @@ install-generated-files: doc if exist ".\extcap\randpktdump.pdb" xcopy ".\extcap\randpktdump.pdb" $(INSTALL_DIR)\extcap /d if exist ".\extcap\sshdump.exe" xcopy ".\extcap\sshdump.exe" $(INSTALL_DIR)\extcap /d if exist ".\extcap\sshdump.pdb" xcopy ".\extcap\sshdump.pdb" $(INSTALL_DIR)\extcap /d + if exist ".\extcap\ciscodump.exe" xcopy ".\extcap\ciscodump.exe" $(INSTALL_DIR)\extcap /d + if exist ".\extcap\ciscodump.pdb" xcopy ".\extcap\ciscodump.pdb" $(INSTALL_DIR)\extcap /d if not exist $(INSTALL_DIR_QT)\extcap mkdir $(INSTALL_DIR_QT)\extcap if exist ".\extcap\androiddump.exe" xcopy ".\extcap\androiddump.exe" $(INSTALL_DIR_QT)\extcap /d if exist ".\extcap\androiddump.pdb" xcopy ".\extcap\androiddump.pdb" $(INSTALL_DIR_QT)\extcap /d @@ -1241,6 +1244,8 @@ install-generated-files: doc if exist ".\extcap\randpktdump.pdb" xcopy ".\extcap\randpktdump.pdb" $(INSTALL_DIR_QT)\extcap /d if exist ".\extcap\sshdump.exe" xcopy ".\extcap\sshdump.exe" $(INSTALL_DIR_QT)\extcap /d if exist ".\extcap\sshdump.pdb" xcopy ".\extcap\sshdump.pdb" $(INSTALL_DIR_QT)\extcap /d + if exist ".\extcap\ciscodump.exe" xcopy ".\extcap\ciscodump.exe" $(INSTALL_DIR_QT)\extcap /d + if exist ".\extcap\ciscodump.pdb" xcopy ".\extcap\ciscodump.pdb" $(INSTALL_DIR_QT)\extcap /d if exist capinfos.exe xcopy capinfos.exe $(INSTALL_DIR) /d if exist capinfos.pdb xcopy capinfos.pdb $(INSTALL_DIR) /d if exist captype.exe xcopy captype.exe $(INSTALL_DIR) /d |