diff options
author | Gerald Combs <gerald@wireshark.org> | 2010-01-19 22:58:12 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2010-01-19 22:58:12 +0000 |
commit | f1958a48f94c4231968b76c43f9ac3028c263db3 (patch) | |
tree | cca6191199482abf9dcc06adcfe2b600e9279885 /Makefile.nmake | |
parent | 2183430a29d8096baea244c37545e7fbde424211 (diff) | |
download | wireshark-f1958a48f94c4231968b76c43f9ac3028c263db3.tar.gz wireshark-f1958a48f94c4231968b76c43f9ac3028c263db3.tar.bz2 wireshark-f1958a48f94c4231968b76c43f9ac3028c263db3.zip |
Drop our requirement for MSVCR71.DLL.
svn path=/trunk/; revision=31578
Diffstat (limited to 'Makefile.nmake')
-rw-r--r-- | Makefile.nmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 1ab04581ba..6891cf15fe 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -768,9 +768,9 @@ process_libs: !ENDIF !IFDEF KFW_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - . kfw-3-2-2-sdk.zip - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - . kfw-3-2-2.zip + . kfw-3-2-2-i386-ws-vc6.zip +# @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ +# . kfw-3-2-2.zip !ENDIF !IFDEF PCAP_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -858,6 +858,7 @@ clean_setup: rm -r -f $(WIRESHARK_LIBS)/gtk-wimp rm -r -f $(WIRESHARK_LIBS)/kfw-2.5 rm -r -f $(WIRESHARK_LIBS)/kfw-3.2.2-ws1 + rm -r -f $(WIRESHARK_LIBS)/kfw-3.2.2-i386-ws-vc6 rm -r -f $(WIRESHARK_LIBS)/libiconv-1.9.1.bin.woe32 rm -r -f $(WIRESHARK_LIBS)/lua5.1 rm -r -f $(WIRESHARK_LIBS)/lua5.1.4 |