diff options
-rw-r--r-- | config.nmake | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/config.nmake b/config.nmake index 18a1ad8c80..3decc3d6a1 100644 --- a/config.nmake +++ b/config.nmake @@ -938,12 +938,21 @@ AIRPDCAP_CONFIG= !IFDEF PCAP_DIR # Nmake uses carets to escape special characters WINPCAP_CONFIG=^#define HAVE_LIBPCAP 1 +# +# This requires that, if you're *building* Wireshark, you have +# the most recent WinPcap's development package. If, at *run* +# time, an older version of WinPcap, missing some routines, +# is found, we work around that. +# PCAP_FINDALLDEVS_CONFIG=^#define HAVE_PCAP_FINDALLDEVS 1 PCAP_DATALINK_NAME_TO_VAL_CONFIG=^#define HAVE_PCAP_DATALINK_NAME_TO_VAL 1 PCAP_DATALINK_VAL_TO_NAME_CONFIG=^#define HAVE_PCAP_DATALINK_VAL_TO_NAME 1 PCAP_DATALINK_VAL_TO_DESCRIPTION_CONFIG=^#define HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION 1 # PCAP_BREAKLOOP won't have any benefit on Win32, but breaks compatibility with 3.0 PCAP_BREAKLOOP_CONFIG= +PCAP_LIST_DATALINKS_CONFIG=^#define HAVE_PCAP_LIST_DATALINKS 1 +PCAP_FREE_DATALINKS_CONFIG=^#define HAVE_PCAP_FREE_DATALINKS 1 +PCAP_SET_DATALINK_CONFIG=^#define HAVE_PCAP_SET_DATALINK 1 !ELSE # no WpdPack installed WINPCAP_CONFIG= @@ -952,12 +961,11 @@ PCAP_DATALINK_NAME_TO_VAL_CONFIG= PCAP_DATALINK_VAL_TO_NAME_CONFIG= PCAP_DATALINK_VAL_TO_DESCRIPTION_CONFIG= PCAP_BREAKLOOP_CONFIG= +PCAP_LIST_DATALINKS_CONFIG= +PCAP_FREE_DATALINKS_CONFIG= +PCAP_SET_DATALINK_CONFIG= !ENDIF -PCAP_LIST_DATALINKS_CONFIG=^#define HAVE_PCAP_LIST_DATALINKS 1 -PCAP_FREE_DATALINKS_CONFIG=^#define HAVE_PCAP_FREE_DATALINKS 1 -PCAP_SET_DATALINK_CONFIG=^#define HAVE_PCAP_SET_DATALINK 1 - !IF DEFINED(PCAP_DIR) && DEFINED(PCAP_REMOTE) PCAP_HAVE_REMOTE_CONFIG=^#define HAVE_REMOTE 1 PCAP_REMOTE_CONFIG=^#define HAVE_PCAP_REMOTE 1 |