[Scummvm-git-logs] scummvm master -> 3b43a99fda97b11ce25a8651d36ac55c1053d5e3
bluegr
bluegr at gmail.com
Sun Apr 25 17:39:59 UTC 2021
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c38e3bdc2a AUDIO: Support building with FluidLite
3b43a99fda CREATE_PROJECT: Support building with FluidLite
Commit: c38e3bdc2a4b3951ef83157068529dcc57c7739a
https://github.com/scummvm/scummvm/commit/c38e3bdc2a4b3951ef83157068529dcc57c7739a
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-04-25T20:39:55+03:00
Commit Message:
AUDIO: Support building with FluidLite
Changed paths:
audio/softsynth/fluidsynth.cpp
base/version.cpp
configure
ports.mk
diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
index f01dd8c736..bda2a54081 100644
--- a/audio/softsynth/fluidsynth.cpp
+++ b/audio/softsynth/fluidsynth.cpp
@@ -29,7 +29,11 @@
// Fluidsynth v2.1+ uses printf in one of it's headers,
// include/fluidsynth/log.h around line 82 so need to include this
// prior scummsys.h inclusion and thus forbidden.h
+#ifdef USE_FLUIDLITE
+#include <fluidlite.h>
+#else
#include <fluidsynth.h>
+#endif
#include "common/scummsys.h"
#include "common/config-manager.h"
diff --git a/base/version.cpp b/base/version.cpp
index 679ed60f1f..b6e2de0f69 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -117,7 +117,9 @@ const char *gScummVMFeatures = ""
"MPEG2 "
#endif
-#ifdef USE_FLUIDSYNTH
+#ifdef USE_FLUIDLITE
+ "FluidLite "
+#elif defined(USE_FLUIDSYNTH)
"FluidSynth "
#endif
diff --git a/configure b/configure
index b547ea69ae..5edd3644e1 100755
--- a/configure
+++ b/configure
@@ -158,6 +158,7 @@ _gif=auto
_theoradec=auto
_faad=auto
_fluidsynth=auto
+_fluidlite=auto
_glew=auto
_opengl_mode=auto
_opengl_game=auto
@@ -965,6 +966,10 @@ Optional Libraries:
installed (optional)
--disable-fluidsynth disable fluidsynth MIDI driver [autodetect]
+ --with-fluidlite-prefix=DIR prefix where libfluidlite is
+ installed (optional)
+ --disable-fluidlite disable fluidlite MIDI driver [autodetect]
+
--with-ieee1284-prefix=DIR prefix where libieee1284 is installed (optional)
--enable-opl2lpt enable OPL2LPT support
@@ -1127,6 +1132,9 @@ for ac_option in $@; do
--disable-faad) _faad=no ;;
--enable-faad) _faad=yes ;;
--disable-fluidsynth) _fluidsynth=no ;;
+ --enable-fluidsynth) _fluidsynth=yes ;;
+ --disable-fluidlite) _fluidlite=no ;;
+ --enable-fluidlite) _fluidlite=yes ;;
--enable-readline) _readline=yes ;;
--disable-readline) _readline=no ;;
--enable-freetype2) _freetype2=yes ;;
@@ -1189,6 +1197,11 @@ for ac_option in $@; do
FLUIDSYNTH_CFLAGS="-I$arg/include"
FLUIDSYNTH_LIBS="-L$arg/lib"
;;
+ --with-fluidlite-prefix=*)
+ arg=`echo $ac_option | cut -d '=' -f 2`
+ FLUIDLITE_CFLAGS="-I$arg/include"
+ FLUIDLITE_LIBS="-L$arg/lib"
+ ;;
--with-mpeg2-prefix=*)
arg=`echo $ac_option | cut -d '=' -f 2`
MPEG2_CFLAGS="-I$arg/include"
@@ -4973,6 +4986,38 @@ fi
define_in_config_if_yes "$_fluidsynth" 'USE_FLUIDSYNTH'
echo "$_fluidsynth"
+#
+# Check for FluidLite
+#
+echocheck "FluidLite"
+
+append_var FLUIDLITE_LIBS "-lfluidlite"
+if test "$_fluidlite" = auto; then
+ _fluidlite=no
+ cat > $TMPC << EOF
+#include <fluidlite.h>
+int main(void) { delete_fluid_settings(new_fluid_settings()); return 0; }
+EOF
+ cc_check_no_clean $FLUIDLITE_CFLAGS $FLUIDLITE_LIBS && _fluidlite=yes
+ if test "$_fluidlite" != yes && test "$_pkg_config" = "yes" && $_pkgconfig --exists fluidlite; then
+ FLUIDLITE_LIBS="`$_pkgconfig --static --libs fluidlite`"
+ cc_check_no_clean $FLUIDLITE_CFLAGS $FLUIDLITE_LIBS && _fluidlite=yes
+ fi
+ cc_check_clean
+fi
+if test "$_fluidlite" = yes && test "$_fluidsynth" = no; then
+ define_in_config_if_yes "$_fluidlite" 'USE_FLUIDLITE'
+ define_in_config_if_yes "$_fluidlite" 'USE_FLUIDSYNTH'
+ append_var LIBS "$FLUIDLITE_LIBS"
+ append_var INCLUDES "$FLUIDLITE_CFLAGS"
+else
+ if test "$_fluidsynth" = yes; then
+ _fluidlite="no (FluidSynth/FluidLite support is mutually exclusive)"
+ fi
+ add_line_to_config_h '#undef USE_FLUIDLITE'
+fi
+echo "$_fluidlite"
+
#
# Check for readline if text_console is enabled
#
diff --git a/ports.mk b/ports.mk
index 71c5305acf..769bc017df 100644
--- a/ports.mk
+++ b/ports.mk
@@ -404,6 +404,9 @@ ifdef USE_OGG
OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libogg.a
endif
+ifdef USE_FLUIDLITE
+OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libfluidlite.a
+else
ifdef USE_FLUIDSYNTH
OSX_STATIC_LIBS += -liconv \
-framework CoreMIDI -framework CoreAudio\
@@ -417,6 +420,7 @@ OSX_STATIC_LIBS += -lreadline -framework AudioUnit
endif
endif
endif
+endif
ifdef USE_MAD
OSX_STATIC_LIBS += $(STATICLIBPATH)/lib/libmad.a
Commit: 3b43a99fda97b11ce25a8651d36ac55c1053d5e3
https://github.com/scummvm/scummvm/commit/3b43a99fda97b11ce25a8651d36ac55c1053d5e3
Author: SupSuper (supsuper at gmail.com)
Date: 2021-04-25T20:39:55+03:00
Commit Message:
CREATE_PROJECT: Support building with FluidLite
Changed paths:
devtools/create_project/create_project.cpp
devtools/create_project/msvc.cpp
devtools/create_project/xcode.cpp
diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp
index da7cbb1ac4..015d739efc 100644
--- a/devtools/create_project/create_project.cpp
+++ b/devtools/create_project/create_project.cpp
@@ -312,6 +312,11 @@ int main(int argc, char *argv[]) {
setFeatureBuildState("vorbis", setup.features, false);
}
+ // HACK: Fluidsynth and Fluidlite can not be enabled simultaneously
+ if (getFeatureBuildState("fluidsynth", setup.features)) {
+ setFeatureBuildState("fluidlite", setup.features, false);
+ }
+
// HACK: These features depend on OpenGL
if (!getFeatureBuildState("opengl", setup.features)) {
setFeatureBuildState("opengl_game", setup.features, false);
@@ -1050,6 +1055,7 @@ const Feature s_features[] = {
{ "freetype", "USE_FREETYPE2", true, true, "FreeType support" },
{ "jpeg", "USE_JPEG", true, true, "libjpeg support" },
{"fluidsynth", "USE_FLUIDSYNTH", true, true, "FluidSynth support" },
+ { "fluidlite", "USE_FLUIDLITE", true, false, "FluidLite support" },
{ "libcurl", "USE_LIBCURL", true, true, "libcurl support" },
{ "sdlnet", "USE_SDL_NET", true, true, "SDL_net support" },
{ "discord", "USE_DISCORD", true, false, "Discord support" },
diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 8518578e75..6ccfee37d5 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -71,6 +71,7 @@ std::string MSVCProvider::getLibraryFromFeature(const char *feature, const Build
{ "freetype", "freetype.lib", "freetyped.lib", 0, 0 },
{ "jpeg", "jpeg.lib", "jpegd.lib", 0, "jpeg-static.lib" },
{"fluidsynth", "fluidsynth.lib", 0, 0, "libfluidsynth.lib" },
+ { "fluidlite", "fluidlite.lib", 0, 0, 0 },
{ "libcurl", "libcurl.lib", "libcurl-d.lib", "ws2_32.lib wldap32.lib crypt32.lib normaliz.lib", 0 },
{ "sdlnet", "SDL_net.lib", 0, "iphlpapi.lib", 0 },
{ "sdl2net", "SDL2_net.lib", 0, "iphlpapi.lib", "SDL_net.lib" },
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index e455499150..6e5a0c3c67 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -465,6 +465,9 @@ void XcodeProvider::setupFrameworksBuildPhase(const BuildSetup &setup) {
DEF_LOCALLIB_STATIC("libglib-2.0");
DEF_SYSTBD("libffi");
}
+ if (CONTAINS_DEFINE(setup.defines, "USE_FLUIDLITE")) {
+ DEF_LOCALLIB_STATIC("libfluidlite");
+ }
if (CONTAINS_DEFINE(setup.defines, "USE_FREETYPE2")) {
DEF_LOCALLIB_STATIC("libfreetype");
}
More information about the Scummvm-git-logs
mailing list