From c0a36f73c0236ad5df4efeb4ec477a93bbcb0902 Mon Sep 17 00:00:00 2001 From: Roza Date: Wed, 6 Jan 2021 03:18:38 -0500 Subject: [PATCH] Include fluidsynth with windows build setup --- meson_options.txt | 2 +- windows/Makefile | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index 5f009058..a699ddde 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -8,7 +8,7 @@ option('macos_min_version', type: 'string', value: '', description: 'Minimum mac option('force32', type: 'boolean', value: false, description: 'Force compiler to build a 32-bit executable') option('cxx11_experimental', type: 'boolean', value: false, description: 'Toggles between using ghc/filesystem or C++11 ') -option('shared_fluid', type: 'boolean', value: false, description: 'Dynamically link fluidsynth at build time') +option('shared_fluid', type: 'boolean', value: true, description: 'Dynamically link fluidsynth at build time') option('cjk_fallback_font', type: 'boolean', value: false, description: 'Use WenQuanYi Micro Hei as the fallback font') option('use_miniffi', type: 'boolean', value: true, description: 'Enable MiniFFI Ruby module (Win32API)') option('easypoke', type: 'boolean', value: false, description: '"Fix" any incompatibilities with Pkmn Essentials.') diff --git a/windows/Makefile b/windows/Makefile index e9b58808..60f71757 100755 --- a/windows/Makefile +++ b/windows/Makefile @@ -231,6 +231,20 @@ $(DOWNLOADS)/openal/cmakebuild/Makefile: $(DOWNLOADS)/openal/CMakeLists.txt $(DOWNLOADS)/openal/CMakeLists.txt: $(CLONE) $(GITLAB)/mkxp-z/openal-soft $(DOWNLOADS)/openal +# FluidSynth +fluidsynth: init_dirs $(LIBDIR)/libfluidsynth.a + +$(LIBDIR)/libfluidsynth.a: $(DOWNLOADS)/fluidsynth/cmakebuild/Makefile + cd $(DOWNLOADS)/fluidsynth/cmakebuild; \ + make -j$(NPROC); make install + +$(DOWNLOADS)/fluidsynth/cmakebuild/Makefile: $(DOWNLOADS)/fluidsynth/CMakeLists.txt + cd $(DOWNLOADS)/fluidsynth; mkdir cmakebuild; cd cmakebuild; \ + $(CMAKE) -DBUILD_SHARED_LIBS=no -Denable-sdl2=no -Denable-readline=no + +$(DOWNLOADS)/fluidsynth/CMakeLists.txt: + $(CLONE) $(GITLAB)/mkxp-z/fluidsynth-sans-glib $(DOWNLOADS)/fluidsynth + # OpenSSL openssl: init_dirs $(LIBDIR)/libssl.a $(LIBDIR)/libssl.a: $(DOWNLOADS)/openssl/Makefile @@ -274,6 +288,6 @@ powerwash: clean-downloads clean-downloads: -rm -rf downloads -deps-core: libvorbis pixman libpng libjpeg physfs sdl2 sdl2image sdl2ttf openal openssl +deps-core: libvorbis pixman libpng libjpeg physfs sdl2 sdl2image sdl2ttf openal openssl fluidsynth everything: deps-core ruby legacy: deps-core legacy-ruby