diff --git a/3ds/1_download_library.sh b/3ds/1_download_library.sh index bd6ba5d7..4ddc1a6f 100755 --- a/3ds/1_download_library.sh +++ b/3ds/1_download_library.sh @@ -77,6 +77,10 @@ download_and_extract $OPUS_URL rm -rf $OPUSFILE_DIR download_and_extract $OPUSFILE_URL +# FluidLite +rm -rf $FLUIDLITE_DIR +download_and_extract $FLUIDLITE_URL + # fmt rm -rf $FMT_DIR download_and_extract $FMT_URL diff --git a/3ds/2_build_toolchain.sh b/3ds/2_build_toolchain.sh index 561a5636..2dd495aa 100755 --- a/3ds/2_build_toolchain.sh +++ b/3ds/2_build_toolchain.sh @@ -101,5 +101,6 @@ install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS install_lib $OPUS_DIR $OPUS_ARGS install_lib $OPUSFILE_DIR $OPUSFILE_ARGS +install_lib_cmake $FLUIDLITE_DIR $FLUIDLITE_ARGS install_lib_cmake $FMT_DIR $FMT_ARGS install_lib_icu_cross diff --git a/android/1_download_library.sh b/android/1_download_library.sh index f966e1ce..710cc3bf 100755 --- a/android/1_download_library.sh +++ b/android/1_download_library.sh @@ -137,6 +137,10 @@ download_and_extract $OPUS_URL rm -rf $OPUSFILE_DIR download_and_extract $OPUSFILE_URL +# FluidLite +rm -rf $FLUIDLITE_DIR +download_and_extract $FLUIDLITE_URL + # fmt rm -rf $FMT_DIR download_and_extract $FMT_URL diff --git a/android/2_build_toolchain.sh b/android/2_build_toolchain.sh index dc2946aa..3caa3e14 100755 --- a/android/2_build_toolchain.sh +++ b/android/2_build_toolchain.sh @@ -104,6 +104,7 @@ function build() { install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS install_lib $OPUS_DIR $OPUS_ARGS install_lib $OPUSFILE_DIR $OPUSFILE_ARGS + install_lib_cmake $FLUIDLITE_DIR $FLUIDLITE_ARGS -DENABLE_SF3=ON install_lib_cmake $FMT_DIR $FMT_ARGS install_lib_icu_cross install_lib_sdl "$2" diff --git a/emscripten/1_download_library.sh b/emscripten/1_download_library.sh index c0ecad99..91f9276a 100755 --- a/emscripten/1_download_library.sh +++ b/emscripten/1_download_library.sh @@ -105,6 +105,10 @@ download_and_extract $OPUS_URL rm -rf $OPUSFILE_DIR download_and_extract $OPUSFILE_URL +# FluidLite +rm -rf $FLUIDLITE_DIR +download_and_extract $FLUIDLITE_URL + # fmt rm -rf $FMT_DIR download_and_extract $FMT_URL diff --git a/emscripten/2_build_toolchain.sh b/emscripten/2_build_toolchain.sh index dcfe87ed..807adac8 100755 --- a/emscripten/2_build_toolchain.sh +++ b/emscripten/2_build_toolchain.sh @@ -104,6 +104,7 @@ install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS #install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS install_lib $OPUS_DIR $OPUS_ARGS install_lib $OPUSFILE_DIR $OPUSFILE_ARGS +install_lib_cmake $FLUIDLITE_DIR $FLUIDLITE_ARGS -DENABLE_SF3=ON install_lib_cmake $FMT_DIR $FMT_ARGS install_lib_sdl2 diff --git a/ios/1_download_library.sh b/ios/1_download_library.sh index 4763d8e2..9515e59b 100755 --- a/ios/1_download_library.sh +++ b/ios/1_download_library.sh @@ -70,6 +70,10 @@ download_and_extract $OPUS_URL rm -rf $OPUSFILE_DIR download_and_extract $OPUSFILE_URL +# FluidLite +rm -rf $FLUIDLITE_DIR +download_and_extract $FLUIDLITE_URL + # fmt rm -rf $FMT_DIR download_and_extract $FMT_URL diff --git a/ios/2_build_toolchain.sh b/ios/2_build_toolchain.sh index 63148936..179e1e73 100755 --- a/ios/2_build_toolchain.sh +++ b/ios/2_build_toolchain.sh @@ -97,6 +97,7 @@ install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS install_lib $OPUS_DIR $OPUS_ARGS install_lib $OPUSFILE_DIR $OPUSFILE_ARGS +install_lib_cmake $FLUIDLITE_DIR $FLUIDLITE_ARGS -DENABLE_SF3=ON install_lib_cmake $FMT_DIR $FMT_ARGS install_lib_icu_cross diff --git a/linux-static/1_download_library.sh b/linux-static/1_download_library.sh index a4c7d56c..f186cd8f 100755 --- a/linux-static/1_download_library.sh +++ b/linux-static/1_download_library.sh @@ -70,6 +70,10 @@ download_and_extract $OPUS_URL rm -rf $OPUSFILE_DIR download_and_extract $OPUSFILE_URL +# FluidLite +rm -rf $FLUIDLITE_DIR +download_and_extract $FLUIDLITE_URL + # fmt rm -rf $FMT_DIR download_and_extract $FMT_URL diff --git a/linux-static/2_build_toolchain.sh b/linux-static/2_build_toolchain.sh index b3595461..9e13afcc 100755 --- a/linux-static/2_build_toolchain.sh +++ b/linux-static/2_build_toolchain.sh @@ -56,6 +56,7 @@ install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS install_lib $OPUS_DIR $OPUS_ARGS install_lib $OPUSFILE_DIR $OPUSFILE_ARGS +install_lib_cmake $FLUIDLITE_DIR $FLUIDLITE_ARGS -DENABLE_SF3=ON install_lib_cmake $FMT_DIR $FMT_ARGS install_lib $ICU_DIR/source $ICU_ARGS install_lib $SDL2_DIR $SDL2_ARGS PULSEAUDIO_CFLAGS=-Ixxxdir PULSEAUDIO_LIBS=-lxxxlib diff --git a/osx/1_download_library.sh b/osx/1_download_library.sh index ae46bfc6..7725ec01 100755 --- a/osx/1_download_library.sh +++ b/osx/1_download_library.sh @@ -70,6 +70,10 @@ download_and_extract $OPUS_URL rm -rf $OPUSFILE_DIR download_and_extract $OPUSFILE_URL +# FluidLite +rm -rf $FLUIDLITE_DIR +download_and_extract $FLUIDLITE_URL + # fmt rm -rf $FMT_DIR download_and_extract $FMT_URL diff --git a/osx/2_build_toolchain.sh b/osx/2_build_toolchain.sh index 7f407200..df40600e 100755 --- a/osx/2_build_toolchain.sh +++ b/osx/2_build_toolchain.sh @@ -82,6 +82,7 @@ install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS install_lib $OPUS_DIR $OPUS_ARGS install_lib $OPUSFILE_DIR $OPUSFILE_ARGS +install_lib_cmake $FLUIDLITE_DIR $FLUIDLITE_ARGS -DENABLE_SF3=ON install_lib_cmake $FMT_DIR $FMT_ARGS install_lib $ICU_DIR/source $ICU_ARGS install_lib $SDL2_DIR $SDL2_ARGS diff --git a/shared/common.sh b/shared/common.sh index 6a298e05..6511bbb8 100644 --- a/shared/common.sh +++ b/shared/common.sh @@ -281,7 +281,7 @@ function cleanup { rm -rf zlib-*/ libpng-*/ freetype-*/ harfbuzz-*/ pixman-*/ expat-*/ libogg-*/ \ libvorbis-*/ tremor-*/ mpg123-*/ libsndfile-*/ libxmp-lite-*/ speexdsp-*/ \ libsamplerate-*/ wildmidi-*/ opus-*/ opusfile-*/ icu/ icu-native/ \ - SDL2-*/ SDL2_mixer-*/ SDL2_image-*/ fmt-*/ + SDL2-*/ SDL2_mixer-*/ SDL2_image-*/ fmt-*/ FluidLite-*/ rm -f *.zip *.bz2 *.gz *.xz *.tgz icudt* *.pl .patches-applied config.cache rm -rf bin/ sbin/ share/ } diff --git a/shared/packages.sh b/shared/packages.sh index 4ab30e77..402b9baa 100644 --- a/shared/packages.sh +++ b/shared/packages.sh @@ -94,6 +94,12 @@ OPUSFILE_URL="https://archive.mozilla.org/pub/opus/$lib-$ver.tar.gz" OPUSFILE_DIR="$lib-$ver" OPUSFILE_ARGS="--disable-http --disable-examples" +lib=FluidLite +ver=813e5481816d049344f1f6ccdc1b22e546970ee6 +FLUIDLITE_URL="https://github.com/divideconcept/$lib/archive/$ver.zip" +FLUIDLITE_DIR="$lib-$ver" +FLUIDLITE_ARGS="-DFLUIDLITE_BUILD_STATIC=ON -DFLUIDLITE_BUILD_SHARED=OFF" + lib=fmt ver=6.2.0 FMT_URL="https://github.com/fmtlib/fmt/releases/download/$ver/$lib-$ver.zip" @@ -132,4 +138,3 @@ ver=2.0.5 SDL2_IMAGE_URL="https://www.libsdl.org/projects/SDL_image/release/$lib-$ver.tar.gz" SDL2_IMAGE_DIR="$lib-$ver" SDL2_IMAGE_ARGS="--disable-jpg --disable-png-shared --disable-tif --disable-webp" - diff --git a/switch/1_download_library.sh b/switch/1_download_library.sh index 7b1917a9..fb65fe6a 100755 --- a/switch/1_download_library.sh +++ b/switch/1_download_library.sh @@ -78,6 +78,10 @@ download_and_extract $OPUS_URL rm -rf $OPUSFILE_DIR download_and_extract $OPUSFILE_URL +# FluidLite +rm -rf $FLUIDLITE_DIR +download_and_extract $FLUIDLITE_URL + # fmt rm -rf $FMT_DIR download_and_extract $FMT_URL diff --git a/switch/2_build_toolchain.sh b/switch/2_build_toolchain.sh index fd6525ff..deaf408e 100755 --- a/switch/2_build_toolchain.sh +++ b/switch/2_build_toolchain.sh @@ -107,5 +107,6 @@ install_lib $LIBSAMPLERATE_DIR $LIBSAMPLERATE_ARGS install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS install_lib $OPUS_DIR $OPUS_ARGS install_lib $OPUSFILE_DIR $OPUSFILE_ARGS +install_lib_cmake $FLUIDLITE_DIR $FLUIDLITE_ARGS install_lib_cmake $FMT_DIR $FMT_ARGS install_lib_icu_cross diff --git a/vita/1_download_library.sh b/vita/1_download_library.sh index 0e9c22c3..ab248774 100755 --- a/vita/1_download_library.sh +++ b/vita/1_download_library.sh @@ -86,6 +86,10 @@ download_and_extract $OPUS_URL rm -rf $OPUSFILE_DIR download_and_extract $OPUSFILE_URL +# FluidLite +rm -rf $FLUIDLITE_DIR +download_and_extract $FLUIDLITE_URL + # fmt rm -rf $FMT_DIR download_and_extract $FMT_URL diff --git a/vita/2_build_toolchain.sh b/vita/2_build_toolchain.sh index 1598c37c..eeab514f 100755 --- a/vita/2_build_toolchain.sh +++ b/vita/2_build_toolchain.sh @@ -123,6 +123,7 @@ install_lib $LIBSNDFILE_DIR $LIBSNDFILE_ARGS install_lib_cmake $LIBXMP_LITE_DIR $LIBXMP_LITE_ARGS install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS +install_lib_cmake $FLUIDLITE_DIR $FLUIDLITE_ARGS -DENABLE_SF3=ON install_lib $OPUS_DIR $OPUS_ARGS install_lib $OPUSFILE_DIR $OPUSFILE_ARGS install_lib_cmake $FMT_DIR $FMT_ARGS diff --git a/wii/1_download_library.sh b/wii/1_download_library.sh index 638cc2b2..5ab55874 100755 --- a/wii/1_download_library.sh +++ b/wii/1_download_library.sh @@ -80,6 +80,10 @@ download_and_extract $OPUS_URL rm -rf $OPUSFILE_DIR download_and_extract $OPUSFILE_URL +# FluidLite +rm -rf $FLUIDLITE_DIR +download_and_extract $FLUIDLITE_URL + # fmt rm -rf $FMT_DIR download_and_extract $FMT_URL diff --git a/wii/2_build_toolchain.sh b/wii/2_build_toolchain.sh index 778a6fb7..613528e2 100755 --- a/wii/2_build_toolchain.sh +++ b/wii/2_build_toolchain.sh @@ -129,6 +129,7 @@ install_lib $LIBSNDFILE_DIR $LIBSNDFILE_ARGS install_lib_cmake $LIBXMP_LITE_DIR $LIBXMP_LITE_ARGS install_lib $SPEEXDSP_DIR $SPEEXDSP_ARGS install_lib_cmake $WILDMIDI_DIR $WILDMIDI_ARGS +install_lib_cmake $FLUIDLITE_DIR $FLUIDLITE_ARGS install_lib $OPUS_DIR $OPUS_ARGS install_lib $OPUSFILE_DIR $OPUSFILE_ARGS install_lib_cmake $FMT_DIR $FMT_ARGS diff --git a/windows/build.cmd b/windows/build.cmd index 6f6a53ca..079360b5 100644 --- a/windows/build.cmd +++ b/windows/build.cmd @@ -20,12 +20,14 @@ xcopy /Y /I /E ..\icu-easyrpg ports\icu-easyrpg vcpkg install --triplet x86-windows-static^ libpng[core] expat[core] pixman[core] freetype[core] harfbuzz[core]^ libvorbis[core] libsndfile[core] wildmidi[core] libxmp-lite[core]^ - speexdsp[core] mpg123[core] opusfile[core] sdl2-image[core] sdl2-mixer[core,nativemidi]^ + speexdsp[core] mpg123[core] opusfile[core] fluidlite[core]^ + sdl2-image[core] sdl2-mixer[core,nativemidi]^ icu-easyrpg[core] fmt[core] :: Build 64-bit libraries vcpkg install --triplet x64-windows-static^ libpng[core] expat[core] pixman[core] freetype[core] harfbuzz[core]^ libvorbis[core] libsndfile[core] wildmidi[core] libxmp-lite[core]^ - speexdsp[core] mpg123[core] opusfile[core] sdl2-image[core] sdl2-mixer[core,nativemidi]^ + speexdsp[core] mpg123[core] opusfile[core] fluidlite[core]^ + sdl2-image[core] sdl2-mixer[core,nativemidi]^ icu-easyrpg[core] fmt[core]