diff options
| author | Bill Meier <wmeier@newsguy.com> | 2007-04-13 01:53:14 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2007-04-13 01:53:14 +0000 |
| commit | e6a1e670179145882e9763575228cb3259ba3998 (patch) | |
| tree | 3a2205394b368e8a8b30c8a2c6f4b659bb7668cf /epan/Makefile.nmake | |
| parent | 994846f215c3a2107f2450e15b5e6881bad5fe56 (diff) | |
Fix for link commands for exntest.exe, tvbtest.exe and reassemble_test.exe;
(Seems to work using vc6 on Windows XP).
svn path=/trunk/; revision=21400
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index c2725bbd57..6a91915f59 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -196,19 +196,18 @@ tvbtest: tvbtest.exe exntest.exe: exntest.obj except.obj @echo Linking $@ - $(LINK) /OUT:$@ $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ + $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ $(GLIB_LIBS) exntest.obj except.obj tvbtest.exe: tvbtest.obj tvbuff.obj except.obj strutil.obj emem.obj @echo Linking $@ - $(LINK) /OUT:$@ $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ - $(GLIB_LIBS) tvbtest.obj tvbuff.obj except.obj strutil.obj emem.obj + $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ + $(GLIB_LIBS) $(ZLIB_LIBS) tvbtest.obj tvbuff.obj except.obj strutil.obj emem.obj reassemble_test.exe: reassemble_test.obj tvbuff.obj except.obj strutil.obj emem.obj \ reassemble.obj @echo Linking $@ - $(LINK) /OUT:$@ $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ - user32.lib wsock32.lib \ + $(LINK) /OUT:$@ $(conflags) $(conlibsdll) $(LOCAL_LDFLAGS) /LARGEADDRESSAWARE /SUBSYSTEM:console \ $(GLIB_LIBS) $(ZLIB_LIBS) reassemble_test.obj tvbuff.obj \ except.obj strutil.obj emem.obj reassemble.obj |