Bill Meier <wmeier@...> writes:
> Recent Windows 7 and Windows XP Buildbot builds have been giving
> "locally defined symbol ... imported in ..." warnings while linking
> editcap:
>
> (I get the same warnings on my system).
Me too. Not sure if this is the right way to fix it, but this seems to work:
Index: Makefile.nmake
===================================================================
--- Makefile.nmake (revision 48128)
+++ Makefile.nmake (working copy)
@@ -327,7 +327,7 @@
# (e.g. epan\plugins.obj) must be built first using epan\Makefile.nmake
(which happens for 'nmake ... all').
# Linking with setargv.obj enables "wildcard expansion" of command-line arguments
capinfos.obj :
- $(CC) $(CFLAGS) -Fd.\ -c capinfos.c
+ $(CC) $(CFLAGS) -DWS_BUILD_DLL -Fd.\ -c capinfos.c
capinfos.exe : $(LIBS_CHECK) config.h $(capinfos_OBJECTS)
wsutil\libwsutil.lib wiretap\wiretap-$(WTAP_VERSION).lib image\capinfos.res
@echo Linking $@
$(LINK) @<<
@@ -340,7 +340,7 @@
# XXX: This makefile does not properly handle doing a 'nmake ... editcap.exe'
directly since some of the .objs
# (e.g. epan\plugins.obj) must be built first using epan\Makefile.nmake
(which happens for 'nmake ... all').
editcap.obj :
- $(CC) $(CFLAGS) -Fd.\ -c editcap.c
+ $(CC) $(CFLAGS) -DWS_BUILD_DLL -Fd.\ -c editcap.c
editcap.exe : $(LIBS_CHECK) config.h $(editcap_OBJECTS) wsutil\libwsutil.lib
wiretap\wiretap-$(WTAP_VERSION).lib image\editcap.res
@echo Linking $@
$(LINK) @<<
