From fb6af0c875a333feb81566824237932a77fa0b18 Mon Sep 17 00:00:00 2001 From: Wengier Date: Sun, 30 May 2021 15:37:25 -0400 Subject: [PATCH] enable slirp/fluidsynth for macOS SDL2 but not SDL1 --- build-debug-macosx | 2 +- build-debug-macosx-sdl2 | 4 ++++ build-macosx | 5 +---- build-macosx-sdl2 | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build-debug-macosx b/build-debug-macosx index 2c32f921f..99359ee1d 100755 --- a/build-debug-macosx +++ b/build-debug-macosx @@ -57,6 +57,6 @@ export INTERNAL_FREETYPE=1 echo Compiling DOSBox-X chmod +x configure -./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --disable-avcodec "$@" || exit 1 +./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --disable-libfluidsynth --disable-libslirp --disable-avcodec "$@" || exit 1 make -j3 || exit 1 diff --git a/build-debug-macosx-sdl2 b/build-debug-macosx-sdl2 index e9f86dec8..6ef704960 100755 --- a/build-debug-macosx-sdl2 +++ b/build-debug-macosx-sdl2 @@ -50,6 +50,10 @@ export CPPFLAGS="$new$CPPFLAGS -g3" export CXXFLAGS="$new$CXXFLAGS -g3" export INTERNAL_FREETYPE=1 +brew list fluid-synth &>/dev/null || brew install fluid-synth +brew list libslirp &>/dev/null || brew install libslirp +brew list pkg-config &>/dev/null || brew install pkg-config + # now compile ourself echo Compiling DOSBox-X chmod +x configure diff --git a/build-macosx b/build-macosx index 64caf8626..a1f28579c 100755 --- a/build-macosx +++ b/build-macosx @@ -53,12 +53,9 @@ export CPPFLAGS="$new$CPPFLAGS" export CXXFLAGS="$new$CXXFLAGS" export INTERNAL_FREETYPE=1 -brew list libslirp &>/dev/null || brew install libslirp -brew list pkg-config &>/dev/null || brew install pkg-config - # now compile ourself echo Compiling DOSBox-X chmod +x configure -./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --disable-avcodec "$@" || exit 1 +./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --disable-libfluidsynth --disable-libslirp --disable-avcodec "$@" || exit 1 make -j3 || exit 1 diff --git a/build-macosx-sdl2 b/build-macosx-sdl2 index 70bc966e3..227b54ce4 100755 --- a/build-macosx-sdl2 +++ b/build-macosx-sdl2 @@ -50,6 +50,7 @@ export CPPFLAGS="$new$CPPFLAGS" export CXXFLAGS="$new$CXXFLAGS" export INTERNAL_FREETYPE=1 +brew list fluid-synth &>/dev/null || brew install fluid-synth brew list libslirp &>/dev/null || brew install libslirp brew list pkg-config &>/dev/null || brew install pkg-config