diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-02 22:19:33 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-03-02 22:19:33 +0000 |
| commit | fc9156a8a0951e645cca59a2173a8101eca0dba8 (patch) | |
| tree | 2b31e3214594efafc898e98c965b00a7b8a45c98 /Makefile.nmake | |
| parent | 73aafe2bc4db3f0d0d98107d2b2e861f1dcbc543 (diff) | |
Try to fix LNK4217 (locally defined symbol imported in function) and C4273 (inconsistent DLL linkage) warnings when compiling for Windows
svn path=/trunk/; revision=48021
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index d7a978a638..b1c54fbd46 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -326,6 +326,8 @@ rawshark.exe : $(LIBS_CHECK) config.h $(rawshark_OBJECTS) epan ui image\rawshark # XXX: This makefile does not properly handle doing a 'nmake ... capinfos.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'). # Linking with setargv.obj enables "wildcard expansion" of command-line arguments +capinfos.obj : + $(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) @<< @@ -337,6 +339,8 @@ capinfos.exe : $(LIBS_CHECK) config.h $(capinfos_OBJECTS) wsutil\libwsutil.lib w # 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) -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) @<< @@ -521,7 +525,8 @@ text2pcap.obj mergecap.obj capinfos.obj editcap.obj reordercap.obj version_info. clean-local: rm -f $(wireshark_OBJECTS) $(tshark_OBJECTS) $(dumpcap_OBJECTS) $(rawshark_OBJECTS) \ $(EXECUTABLES) *.pdb *.sbr *.exe.manifest \ - capinfos.obj editcap.obj mergecap.obj text2pcap.obj \ + capinfos.obj capinfos.exp editcap.obj editcap.exp \ + mergecap.obj text2pcap.obj \ reordercap.obj nio-ie5.obj update.obj \ text2pcap-scanner.obj text2pcap-scanner.c rdps.obj \ rdps.pdb rdps.exe rdps.ilk config.h ps.c $(LIBS_CHECK) \ |