Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-10-17 08:25:43 +00:00
Code Issues Projects Releases Wiki Activity

detect slirp at configure time, aka fix build when ether_dummy.cpp is used

Browse Source
This commit is contained in:
gbeauche 2005-05-14 08:10:49 +00:00
parent 4bf4a1d2b0
commit eff6830415
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BasiliskII/src/Unix/Makefile.in
View File

@ -32,13 +32,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
SLIRP_CFLAGS = @SLIRP_CFLAGS@ SLIRP_CFLAGS = @SLIRP_CFLAGS@
SLIRP_SRCS = \ SLIRP_SRCS = @SLIRP_SRCS@
../slirp/bootp.c ../slirp/ip_output.c ../slirp/tcp_input.c \
../slirp/cksum.c ../slirp/mbuf.c ../slirp/tcp_output.c \
../slirp/debug.c ../slirp/misc.c ../slirp/tcp_subr.c \
../slirp/if.c ../slirp/sbuf.c ../slirp/tcp_timer.c \
../slirp/ip_icmp.c ../slirp/slirp.c ../slirp/tftp.c \
../slirp/ip_input.c ../slirp/socket.c ../slirp/udp.c
SLIRP_OBJS = $(SLIRP_SRCS:../slirp/%.c=obj/%.o) SLIRP_OBJS = $(SLIRP_SRCS:../slirp/%.c=obj/%.o)
## Files ## Files

14
BasiliskII/src/Unix/configure.ac
View File

@ -485,6 +485,20 @@ cygwin*)
EXTRASYSSRCS="../Windows/BasiliskII.rc" EXTRASYSSRCS="../Windows/BasiliskII.rc"
;; ;;
esac esac
dnl Is the slirp library supported?
if [[ "x$ETHERSRC" = "xether_unix.cpp" ]]; then
AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
SLIRP_SRCS="\
../slirp/bootp.c ../slirp/ip_output.c ../slirp/tcp_input.c \
../slirp/cksum.c ../slirp/mbuf.c ../slirp/tcp_output.c \
../slirp/debug.c ../slirp/misc.c ../slirp/tcp_subr.c \
../slirp/if.c ../slirp/sbuf.c ../slirp/tcp_timer.c \
../slirp/ip_icmp.c ../slirp/slirp.c ../slirp/tftp.c \
../slirp/ip_input.c ../slirp/socket.c ../slirp/udp.c"
fi
AC_SUBST(SLIRP_SRCS)
dnl SDL overrides dnl SDL overrides
if [[ "x$WANT_SDL" = "xyes" ]]; then if [[ "x$WANT_SDL" = "xyes" ]]; then
AC_DEFINE(USE_SDL, 1, [Define to enble SDL support]) AC_DEFINE(USE_SDL, 1, [Define to enble SDL support])

4
BasiliskII/src/Unix/ether_unix.cpp
View File

@ -47,9 +47,9 @@
#include <net/if_tun.h> #include <net/if_tun.h>
#endif #endif
// XXX: slirp works on 64-bit platforms, sometimes #ifdef HAVE_SLIRP
#define HAVE_SLIRP 1
#include "libslirp.h" #include "libslirp.h"
#endif
#include "cpu_emulation.h" #include "cpu_emulation.h"
#include "main.h" #include "main.h"