aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.nmake
diff options
context:
space:
mode:
authorTomas Kukosa <tomas.kukosa@siemens.com>2007-11-28 10:18:16 +0000
committerTomas Kukosa <tomas.kukosa@siemens.com>2007-11-28 10:18:16 +0000
commitff7c20938ea3da3ae7d494b35809a2387f497dec (patch)
treecff4fe924fdcfa5a5f882426b40e7fef64045810 /epan/Makefile.nmake
parent60686647d2aefff5065a8869899d15d212115d03 (diff)
Various changes with focus to startup speedup
The startup timeout on Win32 is reduced to 80% without assembler and to 50% with assembler usage (which is optional) proto.c - do not look up in filed tree and inserts in two steps but do it at once - next few small speedups - some often called elementary functions can be optionally implemented in assembler - dispart some functions to see more exact result from profiling packet-tpnc.c - do not reallocate memory for each filed svn path=/trunk/; revision=23643
Diffstat (limited to 'epan/Makefile.nmake')
-rw-r--r--epan/Makefile.nmake16
1 files changed, 15 insertions, 1 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index fd8772c1e7..7951a54179 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -55,7 +55,13 @@ EXTRA_OBJECTS = \
inet_pton.obj \
inet_ntop.obj \
mkstemp.obj \
- strptime.obj
+ strptime.obj \
+!IFDEF NASM
+ asm_utils_win32_x86.obj
+!ELSE
+ asm_utils.obj
+!ENDIF
+
!IFDEF DOXYGEN
@@ -245,6 +251,14 @@ reassemble_test_install:
if exist reassemble_test.exe xcopy reassemble_test.exe $(INSTALL_DIR) /d
+#
+# Compile some time crtical code from assembler if NASM available
+#
+!IFDEF NASM
+asm_utils_win32_x86.obj: asm_utils_win32_x86.asm
+ $(NASM) -f win32 -o $@ $?
+!ENDIF
+
# (Windows only) Copy some sources from /trunk to /trunk/epan.
# It is a cleaner to compile these sources seperately with this makefile than
# using the object code compiled by the makefile in /trunk for both dynamically