aboutsummaryrefslogtreecommitdiffstats
path: root/epan/Makefile.nmake
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-07-14 10:19:12 +0000
committerGuy Harris <guy@alum.mit.edu>2013-07-14 10:19:12 +0000
commit0ca2dd85aec3f8cb84901850d969ea64fe19ca55 (patch)
tree83ef963c71f71385778b44c90fa0d5dfcfa2e0e4 /epan/Makefile.nmake
parenteedc0601d7730a13b59386e500c1523c2bf79256 (diff)
Build tvbtest the same way we build reassemble_test; see whether that
fixes the build errors we're seeing, with complaints about tvbtest.obj : warning LNK4217: locally defined symbol tvb_XX imported in function test tvbtest.obj : error LNK2019: unresolved external symbol __imp_tvb_XXX referenced in function run_tests tvbuff.obj : error LNK2019: unresolved external symbol tvb_XXX referenced in function tvb_new_YYY svn path=/trunk/; revision=50573
Diffstat (limited to 'epan/Makefile.nmake')
-rw-r--r--epan/Makefile.nmake28
1 files changed, 20 insertions, 8 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 19d0e0c660..569d7598d9 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -271,18 +271,30 @@ exntest.exe: $(EXNTEST_OBJ)
!ENDIF
# Object files for tvbtest
-TVBTEST_OBJ=tvbtest.obj \
- tvbuff.obj \
- except.obj \
- to_str.obj \
- strutil.obj \
- charsets.obj \
- emem.obj
+TVBTEST_OBJ=tvbtest.obj
+TVBTEST_LIBS= ..\wiretap\wiretap-$(WTAP_VERSION).lib \
+ wsock32.lib user32.lib \
+ $(GLIB_LIBS) \
+ ..\wsutil\libwsutil.lib \
+ $(GNUTLS_LIBS) \
+ $(PYTHON_LIBS) \
+!IFDEF ENABLE_LIBWIRESHARK
+ libwireshark.lib \
+!ELSE
+ dissectors\dissectors.lib \
+ wireshark.lib \
+ crypt\airpdcap.lib \
+ dfilter\dfilter.lib \
+ ftypes\ftypes.lib \
+ $(C_ARES_LIBS) \
+ $(ADNS_LIBS) \
+ $(ZLIB_LIBS)
+!ENDIF
tvbtest.exe: $(TVBTEST_OBJ)
@echo Linking $@
$(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \
- $(GLIB_LIBS) $(ZLIB_LIBS) $(TVBTEST_OBJ)
+ $(TVBTEST_LIBS) $(GLIB_LIBS) $(ZLIB_LIBS) $(TVBTEST_OBJ)
!IFDEF MANIFEST_INFO_REQUIRED
mt.exe -nologo -manifest "$@.manifest" -outputresource:$@;1
!ENDIF