diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-10 13:52:42 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-09-10 13:52:42 +0000 |
| commit | a81a10a63a75bbf0ea760c594818218012284cf5 (patch) | |
| tree | f2fb333b5800656a623cbc7d971d3379dd827de6 /epan/Makefile.nmake | |
| parent | aca8a4d9894eace3fad853035b2063297c07a57e (diff) | |
From BBA via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5160 :
Followup to 34081: move libwsutil _all_ the way forward so that our inet_pton
is always linked in before wsock32's. This means that our Windows-7 Win64
builds (on which there is a native inet_pton in wsock32) will still work on
pre-Vista Win64's.
svn path=/trunk/; revision=34093
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 361b2debd2..f7c0c179d1 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -38,6 +38,7 @@ WSPYTHON_DIR= # For use when making libwireshark.dll libwireshark_LIBS = \ + ..\wsutil\libwsutil.lib \ $(GLIB_LIBS) \ $(C_ARES_LIBS) \ $(ADNS_LIBS) \ @@ -50,7 +51,6 @@ 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) $(conlibsdll) shell32.lib \ + $(link) $(dlllflags) $(libwireshark_LIBS) $(conlibsdll) shell32.lib \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ /DEF:libwireshark.def /OUT:libwireshark.dll \ /IMPLIB:libwireshark.lib $(LIBWIRESHARK_OBJECTS) \ - $(libwireshark_LIBS) ..\image\libwireshark.res \ + ..\image\libwireshark.res \ dissectors\register.obj \ $(EXTRA_OBJECTS) |