joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-14 02:17:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

ne2000: Decouple emulator from pcap

Browse Source 
Currently the ne2000 emulator explicitly depends on pcap.
Decouple the ne2000 code and pcap code so we can always build with the
emulator but optionally disable pcap.

This also updates build defines and configuration to make this
decoupling explicit to the user.
This commit is contained in:
Jookia
2021-03-04 10:12:13 +11:00
parent 5c6c8f22c5
commit cb132e02ad
10 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -974,20 +974,20 @@ else
AC_MSG_RESULT([no])
fi
dnl FEATURE: Whether to use libpcap, and enable NE2000 emulation
AH_TEMPLATE(C_NE2000,[Define to 1 to enable NE2000 ethernet passthrough, requires libpcap])
dnl FEATURE: Whether to use libpcap, and enable ethernet passthrough
AH_TEMPLATE(C_PCAP,[Define to 1 to enable ethernet passthrough, requires libpcap])
case "$host" in
*-*-cygwin* | *-*-mingw32*)
CFLAGS="$CFLAGS -I$pwd/vs2015/pcap"
CXXFLAGS="$CXXFLAGS -I$pwd/vs2015/pcap"
AC_DEFINE(C_NE2000,1)
AC_DEFINE(C_PCAP,1)
;;
*)
if test x$have_pcap_lib = xyes -a x$have_pcap_h = xyes ; then
LIBS="$LIBS -lpcap";
AC_DEFINE(C_NE2000,1)
AC_DEFINE(C_PCAP,1)
else
AC_MSG_WARN([Can't find libpcap, NE2000 ethernet passthrough disabled])
AC_MSG_WARN([Can't find libpcap, ethernet passthrough disabled])
fi
;;
esac