From cdc6182bdf804eaa1dad943c19be4a3ee7db8efc Mon Sep 17 00:00:00 2001
From: maron2000 <68574602+maron2000@users.noreply.github.com>
Date: Wed, 5 Jun 2024 20:50:45 +0900
Subject: [PATCH 1/2] Restore libslirp support (MinGW x64)

---
 .github/workflows/mingw64.yml | 3 +--
 configure.ac                  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/mingw64.yml b/.github/workflows/mingw64.yml
index 47c32e6081..6db1343d5b 100644
--- a/.github/workflows/mingw64.yml
+++ b/.github/workflows/mingw64.yml
@@ -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
diff --git a/configure.ac b/configure.ac
index 7c325af0be..2b6827a526 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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"

From d7c96097b0b8dca42d2a49b1645ebe4c460d9b05 Mon Sep 17 00:00:00 2001
From: maron2000 <68574602+maron2000@users.noreply.github.com>
Date: Wed, 5 Jun 2024 22:11:22 +0900
Subject: [PATCH 2/2] Restore libslirp (MinGW x64 Windows Installer)

---
 .github/workflows/windows-installers.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/windows-installers.yml b/.github/workflows/windows-installers.yml
index e987fce2d1..50beb8a04b 100644
--- a/.github/workflows/windows-installers.yml
+++ b/.github/workflows/windows-installers.yml
@@ -239,7 +239,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: |
@@ -255,7 +255,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
           mkdir -p $top/package/