osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Update to WpdPack 4.0.2 and NASM 2.02 

svn path=/trunk/; revision=25278
This commit is contained in:
Tomas Kukosa 2008-05-12 19:13:55 +00:00
parent aad8618736
commit 27ccd63ce7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.nmake
View File

@ -672,7 +672,7 @@ process_libs:
!ENDIF
!IFDEF PCAP_DIR
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
. WpdPack_3_1.zip
. WpdPack_4_0_2.zip
!ENDIF
!IFDEF AIRPCAP_DIR
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@ -776,7 +776,7 @@ process_libs:
!ENDIF
!IFDEF NASM
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
. nasm-2.00-win32.zip
. nasm-2.02-win32.zip
!ENDIF
@echo.
@echo Wireshark is ready to build.
@ -801,6 +801,7 @@ clean_setup:
rm -r -f $(WIRESHARK_LIBS)/libsmi-0.4.5
rm -r -f $(WIRESHARK_LIBS)/libsmi-0.4.8
rm -r -f $(WIRESHARK_LIBS)/nasm-2.00
rm -r -f $(WIRESHARK_LIBS)/nasm-2.02
rm -r -f $(WIRESHARK_LIBS)/pcre-6.4
rm -r -f $(WIRESHARK_LIBS)/pcre-7.0
rm -r -f $(WIRESHARK_LIBS)/portaudio_v18_1

3
config.nmake
View File

@ -98,8 +98,7 @@ MSVC_VARIANT=MSVC6
# If you don't have NASM, comment this line out, so that NASM
# isn't defined.
#
#NASM=c:\progs\nasm\nasm.exe
NASM=$(WIRESHARK_LIBS)\nasm-2.00\nasm.exe
NASM=$(WIRESHARK_LIBS)\nasm-2.02\nasm.exe
##### Libraries #####

4
tools/win32-setup.sh
View File

@ -7,8 +7,8 @@
# in order to provide backward compatibility with older trees (e.g. a
# previous release or an older SVN checkout).
# Save previous tag.
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-04-22/packages/"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-04-24/packages/"
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-04-24/packages/"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-05-12/packages/"
# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"