diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-15 15:13:17 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-15 15:13:17 +0000 |
| commit | 4584a8114933597ef05c69556870f666ac47564f (patch) | |
| tree | 5863509bd2d198614ce1ff2fed80de3dd17f8618 /epan/Makefile.nmake | |
| parent | 2b52159449014063cd3c8136fed05ad51ace0d6b (diff) | |
Revert 34081 and 34093 in preparation for a cleaner fix.
svn path=/trunk/; revision=34121
Diffstat (limited to 'epan/Makefile.nmake')
| -rw-r--r-- | epan/Makefile.nmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index f7c0c179d1..361b2debd2 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -38,7 +38,6 @@ WSPYTHON_DIR= # For use when making libwireshark.dll libwireshark_LIBS = \ - ..\wsutil\libwsutil.lib \ $(GLIB_LIBS) \ $(C_ARES_LIBS) \ $(ADNS_LIBS) \ @@ -51,6 +50,7 @@ libwireshark_LIBS = \ $(PYTHON_LIBS) \ $(SMI_LIBS) \ $(GEOIP_LIBS) \ + ..\wsutil\libwsutil.lib \ ..\wiretap\wiretap-$(WTAP_VERSION).lib \ crc\crc.lib \ crypt\airpdcap.lib \ @@ -89,11 +89,11 @@ libwireshark.exp: libwireshark.dll libwireshark.dll: ..\config.h $(LIBWIRESHARK_OBJECTS) libwireshark.def crc crypt ftypes dfilter $(WSLUA_DIR) $(WSPYTHON_DIR) dissectors $(DOXYGEN_DEP) $(EXTRA_OBJECTS) \ crc\crc.lib crypt\airpdcap.lib ftypes\ftypes.lib dfilter\dfilter.lib dissectors\dissectors.lib $(WSLUA_LIB) $(WSPYTHON_LIB) ..\image\libwireshark.res @echo Linking libwireshark.dll - $(link) $(dlllflags) $(libwireshark_LIBS) $(conlibsdll) shell32.lib \ + $(link) $(dlllflags) $(conlibsdll) shell32.lib \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ /DEF:libwireshark.def /OUT:libwireshark.dll \ /IMPLIB:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ - ..\image\libwireshark.res \ + $(libwireshark_LIBS) ..\image\libwireshark.res \ dissectors\register.obj \ $(EXTRA_OBJECTS) |