diff options
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 16 |
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 |