diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-02-28 16:08:47 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2012-02-28 16:08:47 +0000 |
| commit | fe57fc85534db1316d4105d23f3a2cd566491a18 (patch) | |
| tree | 49c462fd4a26b15aeac07e6b51d1d0b8a5293c2e /epan/Makefile.nmake | |
| parent | 63b4dc259348eddf921d351eae2de53494f82cb3 (diff) | |
Another try: we're in epan here so getting to libwsutil and wiretap requires going up a directory; getting to epan things does not require 'epan' in the path.
svn path=/trunk/; revision=41225
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index bc13935466..bb924501b1 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -253,20 +253,20 @@ tvbtest.exe: $(TVBTEST_OBJ) # Object files for reassemble_test REASSEMBLE_TEST_OBJ=reassemble_test.obj -REASSEMBLE_TEST_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ +REASSEMBLE_TEST_LIBS= ..\wiretap\wiretap-$(WTAP_VERSION).lib \ wsock32.lib user32.lib \ $(GLIB_LIBS) \ - wsutil\libwsutil.lib \ + ..\wsutil\libwsutil.lib \ $(GNUTLS_LIBS) \ $(PYTHON_LIBS) \ !IFDEF ENABLE_LIBWIRESHARK - epan\libwireshark.lib \ + libwireshark.lib \ !ELSE - epan\dissectors\dissectors.lib \ - epan\wireshark.lib \ - epan\crypt\airpdcap.lib \ - epan\dfilter\dfilter.lib \ - epan\ftypes\ftypes.lib \ + dissectors\dissectors.lib \ + wireshark.lib \ + crypt\airpdcap.lib \ + dfilter\dfilter.lib \ + ftypes\ftypes.lib \ $(C_ARES_LIBS) \ $(ADNS_LIBS) \ $(ZLIB_LIBS) |