aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.nmake
diff options
context:
space:
mode:
authorRichard van der Hoff <richardv@mxtelecom.com>2007-04-08 11:48:59 +0000
committerRichard van der Hoff <richardv@mxtelecom.com>2007-04-08 11:48:59 +0000
commitbac617e731235d8d3e3f6a5636a5007939e8962a (patch)
tree9871d485d328a067d31cea4da2b15d6dafbf4e74 /epan/Makefile.nmake
parent52727b58b7a66dda0acaf9197a530f34f2c99a61 (diff)
another go at making reassemble_test build: give it lots more libraries
svn path=/trunk/; revision=21352
Diffstat (limited to 'epan/Makefile.nmake')
-rw-r--r--epan/Makefile.nmake18
1 files changed, 16 insertions, 2 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 84122ef815..1bf019a9b7 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -192,6 +192,20 @@ exntest: exntest.exe
reassemble_test: reassemble_test.exe
tvbtest: tvbtest.exe
+# don't really understand why we need all this extra guff - shouldn't
+# they be in libwireshark.lib, otherwise how does tshark.exe link?
+REASSEMBLE_TEST_LIBS=\
+ crypt\airpdcap.lib \
+ dfilter\dfilter.lib \
+ ftypes\ftypes.lib \
+ $(ADNS_LIBS) \
+ $(PCRE_LIBS) \
+ $(ZLIB_LIBS) \
+ $(GLIB_LIBS) \
+ $(GNUTLS_LIBS) \
+ libwireshark.lib
+
+
exntest.exe: exntest.obj except.obj
@echo Linking $@
$(LINK) /OUT:$@ $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \
@@ -202,10 +216,10 @@ tvbtest.exe: tvbtest.obj tvbuff.obj except.obj strutil.obj emem.obj
$(LINK) /OUT:$@ $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \
$(GLIB_LIBS) tvbtest.obj tvbuff.obj except.obj strutil.obj emem.obj
-reassemble_test.exe: reassemble_test.obj libwireshark.lib
+reassemble_test.exe: reassemble_test.obj $(REASSEMBLE_TEST_LIBS)
@echo Linking $@
$(LINK) /OUT:$@ $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \
- $(GLIB_LIBS) reassemble_test.obj libwireshark.lib
+ $(REASSEMBLE_TEST_LIBS) reassemble_test.obj
# (Windows only) Copy some sources from /trunk to /trunk/epan.
# It is a cleaner to compile these sources seperately with this makefile than