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

disable libslirp for mingw-lowend

Browse Source
This commit is contained in:
Wengier
2021-05-29 19:04:56 -04:00
parent 9bbe205c7d
commit 41814c23b8
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-mingw
View File

@@ -59,7 +59,7 @@ export CPPFLAGS="$new$CPPFLAGS"
export CXXFLAGS="$new$CXXFLAGS"
export INTERNAL_FREETYPE=1
pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp >/dev/null
pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
# now compile ourself
echo Compiling DOSBox-X

2
build-mingw-lowend
View File

@@ -58,6 +58,6 @@ export INTERNAL_FREETYPE=1
echo Compiling DOSBox-X
chmod +x configure
# FIXME: I would like MinGW builds to enable the debugger, eventually
./configure --enable-core-inline --disable-mt32 --enable-d3d9 --enable-d3d-shaders --prefix=/usr "$@" || exit 1
./configure --enable-core-inline --disable-mt32 --disable-libfluidsynth --disable-libslirp --enable-d3d9 --enable-d3d-shaders --prefix=/usr "$@" || exit 1
make -j3 || exit 1

2
build-mingw-sdl2
View File

@@ -57,7 +57,7 @@ export CPPFLAGS="$new$CPPFLAGS"
export CXXFLAGS="$new$CXXFLAGS"
export INTERNAL_FREETYPE=1
pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp >/dev/null
pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
# now compile ourself
echo Compiling DOSBox-X

2
build-mingw-sdldraw
View File

@@ -54,6 +54,8 @@ export CPPFLAGS="$new$CPPFLAGS"
export CXXFLAGS="$new$CXXFLAGS"
export INTERNAL_FREETYPE=1
pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
# now compile ourself
echo Compiling DOSBox-X
chmod +x configure

17
configure.ac
View File

@@ -1002,30 +1002,33 @@ esac
dnl FEATURE: Whether to use libslirp, and enable userspace TCP/IP emulation
AH_TEMPLATE(C_SLIRP, [Define to 1 to enable userspace TCP/IP emulation, requires libslirp])
case "$host" in
AC_ARG_ENABLE(libslirp,AC_HELP_STRING([--disable-libslirp],[Disable libslirp support]),enable_libslirp=$enableval,enable_libslirp=yes)
if test x$enable_libslirp == xyes ; then
case "$host" in
*-*-cygwin* | *-*-mingw32*)
if test x$have_slirp_h = xyes; then
have_slirp_lib=yes
fi
;;
esac
if test x$have_slirp_lib = xyes -a x$have_slirp_h = xyes ; then
esac
if test x$have_slirp_lib = xyes -a x$have_slirp_h = xyes ; then
have_slirp=yes
AC_DEFINE(C_SLIRP,1)
LIBS="$LIBS "`pkg-config slirp --libs`
CFLAGS="$CFLAGS "`pkg-config slirp --cflags`
CPPFLAGS="$CPPFLAGS "`pkg-config slirp --cflags`
else
else
have_slirp=no
AC_MSG_WARN([Can't find libslirp, userspace TCP/IP emulation disabled])
fi
case "$host" in
fi
case "$host" in
*-*-cygwin* | *-*-mingw32*)
if test x$have_slirp = xyes; then
LIBS="$LIBS -lintl -liconv"
fi
;;
esac
esac
fi
if test x$enable_x11 != xno; then
dnl FEATURE: Whether to use X11 XKBlib