Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restore libslirp support (MinGW x64 builds) #5037

Merged
merged 2 commits into from
Jun 5, 2024
Merged

Restore libslirp support (MinGW x64 builds) #5037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdc6182
Restore libslirp support (MinGW x64)
maron2000 Jun 5, 2024
d7c9609
Restore libslirp (MinGW x64 Windows Installer)
maron2000 Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/mingw64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/windows-installers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading