diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2008-05-12 19:13:55 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2008-05-12 19:13:55 +0000 |
| commit | 27ccd63ce7385d6f85e4bacd98e589871ea5a1b6 (patch) | |
| tree | c1354e0bf42fa2f3c2fe765e1c14da92d6b916f3 | |
| parent | aad861873617e5756b2210865cd8e3b0223850f3 (diff) | |
Update to WpdPack 4.0.2 and NASM 2.02
svn path=/trunk/; revision=25278
| -rw-r--r-- | Makefile.nmake | 5 | ||||
| -rw-r--r-- | config.nmake | 3 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index f0d745026f..5de3b97d52 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -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 diff --git a/config.nmake b/config.nmake index f9ed61c551..dc30058991 100644 --- a/config.nmake +++ b/config.nmake @@ -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 ##### diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index d9742b216f..957e0a39da 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -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/" |