osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Build with assembler support (NASM). 

svn path=/trunk/; revision=23947
This commit is contained in:
Anders Broman 2007-12-25 15:55:19 +00:00
parent 05b530033e
commit 6fbf8be77d
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.nmake
View File

@ -602,7 +602,6 @@ REQUIRED_TOOLS=\
/usr/bin/find \
$(PERL) \
$(PYTHON) \
$(NASM) \
sed \
unzip \
wget
@ -784,6 +783,10 @@ process_libs:
!IFDEF UPX
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
. upx301w.zip
!ENDIF
!IFDEF NASM
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
. nasm-2.00-win32.zip
!ENDIF
@echo.
@echo Wireshark is ready to build.

2
config.nmake
View File

@ -98,7 +98,7 @@ MSVC_VARIANT=MSVC6
# isn't defined.
#
#NASM=c:\progs\nasm\nasm.exe
NASM=$(WIRESHARK_LIBS)\nasm-2.00\nasm.exe
##### Libraries #####

2
epan/Makefile.nmake
View File

@ -252,7 +252,7 @@ reassemble_test_install:
#
# Compile some time crtical code from assembler if NASM available
# Compile some time critical code from assembler if NASM available
#
!IFDEF NASM
asm_utils_win32_x86.obj: asm_utils_win32_x86.asm

6
tools/win32-setup.sh
View File

@ -7,11 +7,11 @@
# in order to provide backward compatibility with older trees (e.g. a
# previous release or an older SVN checkout).
# Save privious tag.
# DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-12-05/packages/"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-12-15/packages/"
# DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-12-15/packages/"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-12-25/packages/
# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"
# DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"
err_exit () {
echo ""