Restore libslirp support (MinGW x64)

This commit is contained in:
maron2000 2024-06-05 20:50:45 +09:00
parent 2ef882f4f3
commit cdc6182bdf
2 changed files with 3 additions and 4 deletions

View File

@ -26,7 +26,7 @@ jobs:
with:
msystem: MINGW64
update: true
install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool mingw-w64-x86_64-nasm autoconf automake
install: git make mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool mingw-w64-x86_64-nasm autoconf automake mingw-w64-x86_64-libslirp
- name: Update build info
shell: bash
run: |
@ -42,7 +42,6 @@ jobs:
- name: Build MinGW64 SDL1
run: |
top=`pwd`
ln -s $top/build-scripts/mingw/lowend-bin/make.exe /usr/bin/make.exe
./build-mingw
strip -s $top/src/dosbox-x.exe
- name: Package MinGW64 SDL1

View File

@ -1144,8 +1144,8 @@ if test x$enable_libslirp = 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`
CFLAGS="$CFLAGS -DLIBSLIRP_STATIC "`pkg-config slirp --cflags`
CPPFLAGS="$CPPFLAGS -DLIBSLIRP_STATIC "`pkg-config slirp --cflags`
case "$host" in
*-*-cygwin* | *-*-mingw32*)
LIBS="$LIBS -lintl"