From e2cd2bf4f2e515e8cbc68e4610c1c2786c352042 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 8 Apr 2009 19:15:10 +0000
Subject: Don't assemble asm_utils_win32_x86 on x64. Export a dummy
 read_keytab_file if we're not using any encryption libraries on Windows.

This fixes the last Win64 compilation problems in epan.

svn path=/trunk/; revision=28008
---
 epan/Makefile.nmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'epan/Makefile.nmake')

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 47284c7dbc..7b82c8387b 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -65,7 +65,7 @@ EXTRA_OBJECTS = \
 	inet_ntop.obj	\
 	mkstemp.obj	\
 	strptime.obj	\
-!IFDEF NASM
+!IF defined(NASM) && "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
 	asm_utils_win32_x86.obj
 !ELSE
 	asm_utils.obj
@@ -272,7 +272,7 @@ reassemble_test_install:
 #
 !IFDEF NASM
 asm_utils_win32_x86.obj: asm_utils_win32_x86.asm
-	$(NASM) -f win32 -o $@ $?
+	$(NASM) -f $(WIRESHARK_TARGET_PLATFORM) -o $@ $?
 !ENDIF
 
 # (Windows only) Copy some sources from /trunk to /trunk/epan.
-- 
cgit v1.2.3