mirror of
https://github.com/joncampbell123/dosbox-x.git
synced 2025-05-09 11:51:09 +08:00
Restore libslirp support (MinGW x64)
This commit is contained in:
parent
2ef882f4f3
commit
cdc6182bdf
3
.github/workflows/mingw64.yml
vendored
3
.github/workflows/mingw64.yml
vendored
@ -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
|
||||
|
@ -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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user