diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-02-17 23:18:55 +0100 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-02-18 00:01:00 +0000 |
| commit | 20fcb6c2e17811c9fefa22c7fb299173012a6bca (patch) | |
| tree | 6f8922d0c91ffc6a7ad9617f184b11182cdde5a5 /extcap | |
| parent | 7382b026255620b80397da338c2c6dde78f78673 (diff) | |
| download | wireshark-20fcb6c2e17811c9fefa22c7fb299173012a6bca.tar.gz | |
Fix compilation of extcap programs with NMake
Change-Id: I80e17aeeab5bf747c6ba06168245d38d6d78efa9
Reviewed-on: https://code.wireshark.org/review/13986
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'extcap')
| -rw-r--r-- | extcap/Makefile.nmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/extcap/Makefile.nmake b/extcap/Makefile.nmake index e85096164d..7845326ec6 100644 --- a/extcap/Makefile.nmake +++ b/extcap/Makefile.nmake @@ -17,7 +17,7 @@ LDFLAGS = /NOLOGO /INCREMENTAL:NO $(LOCAL_LDFLAGS) # We use GENERATED_CFLAGS to get around flex's non-LLP64-compliant output GENERATED_CFLAGS=\ $(STANDARD_CFLAGS) \ - /I. /Iwiretap $(GLIB_CFLAGS) \ + /I. /I.. /Iwiretap $(GLIB_CFLAGS) \ $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \ $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(GNUTLS_CFLAGS) \ $(SMI_CFLAGS) $(GEOIP_CFLAGS) $(LIBSSH_CFLAGS) $(WINSPARKLE_CFLAGS) @@ -42,7 +42,7 @@ androiddump_LIBS = $(anddroiddump_WSLIBS) \ randpktdump_OBJECTS = $(randpktdump_SOURCES:.c=.obj) randpktdump_WSLIBS = \ - ..\randpkt_core\randpkt_core.lib \ + ..\randpkt_core\librandpkt_core.lib \ ..\wiretap\wiretap-$(WTAP_VERSION).lib \ ..\wsutil\libwsutil.lib @@ -67,7 +67,9 @@ EXECUTABLES=androiddump.exe randpktdump.exe EXECUTABLES += sshdump.exe !ENDIF -androiddump.exe : $(LIBS_CHECK) config.h androiddump.obj $(anddroiddump_WSLIBS) +all: $(EXECUTABLES) + +androiddump.exe : $(LIBS_CHECK) ..\config.h androiddump.obj $(anddroiddump_WSLIBS) @echo Linking $@ $(LINK) @<< /OUT:androiddump.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:WINDOWS androiddump.obj $(androiddump_LIBS) @@ -76,7 +78,7 @@ androiddump.exe : $(LIBS_CHECK) config.h androiddump.obj $(anddroiddump_WSLIBS) mt.exe -nologo -manifest "androiddump.exe.manifest" -outputresource:androiddump.exe;1 !ENDIF -randpktdump.exe : $(LIBS_CHECK) config.h randpktdump.obj $(randpktdump_WSLIBS) +randpktdump.exe : $(LIBS_CHECK) ..\config.h randpktdump.obj $(randpktdump_WSLIBS) @echo Linking $@ $(LINK) @<< /OUT:randpktdump.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:WINDOWS randpktdump.obj $(randpktdump_LIBS) @@ -86,7 +88,7 @@ randpktdump.exe : $(LIBS_CHECK) config.h randpktdump.obj $(randpktdump_WSLIBS) !ENDIF !IFDEF LIBSSH_DIR -sshdump.exe : $(LIBS_CHECK) config.h sshdump.obj $(sshdump_WSLIBS) +sshdump.exe : $(LIBS_CHECK) ..\config.h sshdump.obj $(sshdump_WSLIBS) @echo Linking $@ $(LINK) @<< /OUT:sshdump.exe $(conflags) $(conlibsdll) $(LDFLAGS) /SUBSYSTEM:WINDOWS sshdump.obj $(sshdump_LIBS) |