diff --git a/.github/workflows/mingw32.yml b/.github/workflows/mingw32.yml index e047ca444..73415790c 100644 --- a/.github/workflows/mingw32.yml +++ b/.github/workflows/mingw32.yml @@ -26,7 +26,7 @@ jobs: with: msystem: MINGW32 update: true - install: git make base-devel mingw-w64-i686-toolchain mingw-w64-i686-libtool mingw-w64-i686-nasm autoconf automake mingw-w64-i686-ncurses mingw-w64-i686-binutils mingw-w64-i686-libslirp + install: git make base-devel mingw-w64-i686-toolchain mingw-w64-i686-libtool mingw-w64-i686-nasm autoconf automake mingw-w64-i686-ncurses mingw-w64-i686-binutils - name: Install libslirp if: false run: | diff --git a/.github/workflows/mingw64.yml b/.github/workflows/mingw64.yml index e661bc53b..47c32e608 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-libslirp mingw-w64-x86_64-libtool mingw-w64-x86_64-nasm autoconf automake + install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool mingw-w64-x86_64-nasm autoconf automake - name: Update build info shell: bash run: | diff --git a/.github/workflows/windows-installers.yml b/.github/workflows/windows-installers.yml index 9d999a239..e987fce2d 100644 --- a/.github/workflows/windows-installers.yml +++ b/.github/workflows/windows-installers.yml @@ -179,7 +179,7 @@ jobs: with: msystem: MINGW32 update: true - install: git mingw-w64-i686-toolchain mingw-w64-i686-libtool mingw-w64-i686-nasm autoconf automake mingw-w64-i686-libslirp + install: git mingw-w64-i686-toolchain mingw-w64-i686-libtool mingw-w64-i686-nasm autoconf automake - name: Update build info shell: bash run: | @@ -239,7 +239,7 @@ jobs: with: msystem: MINGW64 update: true - install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-libslirp mingw-w64-x86_64-libtool mingw-w64-x86_64-nasm autoconf automake + install: git mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool mingw-w64-x86_64-nasm autoconf automake - name: Update build info shell: bash run: | diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index ca4b0141b..5f72374bd 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -8740,6 +8740,7 @@ int main(int argc, char* argv[]) SDL_MAIN_NOEXCEPT { #endif //defined (C_SDL2) #if defined(__MINGW32__) && defined(C_DEBUG) LOG_MSG("EXPERIMENTAL: Debugger enabled for MinGW build, DOSBox-X crashes depending on the terminal software you use. Launching from command prompt (cmd.exe) is recommended."); + LOG_MSG("NOTICE: libslirp support disabled due to a bug in recent libslirp release"); #endif /* -- -- decide whether to show menu in GUI */ if (control->opt_nogui || menu.compatible)