ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux Ports: Now require libpcap for all POSIX builds. (Related to commit 5e67e9c.)

This commit is contained in:
rogerman 2018-08-11 13:19:45 -07:00
parent 6797f00d23
commit c9009c9302
2 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
desmume/src/frontend/posix/configure.ac
View File

@ -40,6 +40,9 @@ AC_DEFINE_UNQUOTED([SVN_REV_STR], ["$REVISION"], [subversion revision number str
dnl - Check for zlib dnl - Check for zlib
AC_CHECK_LIB(z, gzopen, [], [AC_MSG_ERROR([zlib was not found, we can't go further. Please install it or specify the location where it's installed.])]) AC_CHECK_LIB(z, gzopen, [], [AC_MSG_ERROR([zlib was not found, we can't go further. Please install it or specify the location where it's installed.])])
dnl - Check for libpcap
AC_CHECK_LIB(pcap, main, [LIBS="$LIBS -lpcap"], [AC_MSG_ERROR([libpcap was not found, we can't go further. Please install it or specify the location where it's installed.])])
dnl - Check for zziplib dnl - Check for zziplib
AC_CHECK_LIB(zzip, zzip_open, [ AC_CHECK_LIB(zzip, zzip_open, [
LIBS="-lzzip $LIBS" LIBS="-lzzip $LIBS"
@ -261,13 +264,12 @@ AM_CONDITIONAL([HAVE_JIT], [test "x$HAVE_JIT" = "xyes"])
dnl - wifi support dnl - wifi support
AC_ARG_ENABLE(wifi, AC_ARG_ENABLE(wifi,
[AC_HELP_STRING(--enable-wifi, enable experimental wifi comm support)], [AC_HELP_STRING(--enable-wifi, enable wifi support)],
[ [wifisupport=yes])
AC_CHECK_LIB(pcap, main,[
if test "x$wifisupport" = "xyes" ; then
AC_DEFINE(EXPERIMENTAL_WIFI_COMM) AC_DEFINE(EXPERIMENTAL_WIFI_COMM)
LIBS="$LIBS -lpcap"], fi
[AC_MSG_WARN([pcap library not found, wifi will not work])])
])
dnl Set compiler library flags per host architecture dnl Set compiler library flags per host architecture
case $host in case $host in

3
desmume/src/wifi.cpp
View File

@ -2733,6 +2733,8 @@ bool WifiHandler::CommStart()
WifiCommInterface *selectedCommInterface = NULL; WifiCommInterface *selectedCommInterface = NULL;
WifiMACMode selectedMACMode = WifiMACMode_Manual; WifiMACMode selectedMACMode = WifiMACMode_Manual;
if (pendingEmulationLevel != WifiEmulationLevel_Off)
{
switch (this->_selectedCommID) switch (this->_selectedCommID)
{ {
case WifiCommInterfaceID_AdHoc: case WifiCommInterfaceID_AdHoc:
@ -2765,6 +2767,7 @@ bool WifiHandler::CommStart()
default: default:
break; break;
} }
}
// Stop the current comm interface. // Stop the current comm interface.
if (this->_currentCommInterface != NULL) if (this->_currentCommInterface != NULL)