MSVC won't allow us to erase an item that's managed by 'const_iterator'

[ardour.git] / tools / update_fluidsynth.sh

diff --git a/tools/update_fluidsynth.sh b/tools/update_fluidsynth.sh
index 785d68bc0fedf510e833f67c4b477b3eaf4c5d38..173145e3921fc233eb850705a1682713adfa91eb 100755 (executable)
--- a/tools/update_fluidsynth.sh
+++ b/tools/update_fluidsynth.sh
@@ -23,7 +23,7 @@ cd $TMP
 #git clone git://git.code.sf.net/p/fluidsynth/code-git fs-git
 git clone git://github.com/FluidSynth/fluidsynth.git fs-git
 
-FSR=fs-git/fluidsynth/
+FSR=fs-git/
 
 rsync -auc --info=progress2 \
        ${FSR}src/midi/fluid_midi.c \
@@ -48,24 +48,30 @@ rsync -auc --info=progress2 \
        ${FSR}src/rvoice/fluid_rvoice_mixer.h \
        ${FSR}src/sfloader/fluid_defsfont.c \
        ${FSR}src/sfloader/fluid_defsfont.h \
+       ${FSR}src/sfloader/fluid_samplecache.c \
+       ${FSR}src/sfloader/fluid_samplecache.h \
+       ${FSR}src/sfloader/fluid_sffile.c \
+       ${FSR}src/sfloader/fluid_sffile.h \
+       ${FSR}src/sfloader/fluid_sfont.c \
        ${FSR}src/sfloader/fluid_sfont.h \
        ${FSR}src/synth/fluid_chan.c \
        ${FSR}src/synth/fluid_chan.h \
        ${FSR}src/synth/fluid_event.c \
-       ${FSR}src/synth/fluid_event_priv.h \
-       ${FSR}src/synth/fluid_event_queue.h \
+       ${FSR}src/synth/fluid_event.h \
        ${FSR}src/synth/fluid_gen.c \
        ${FSR}src/synth/fluid_gen.h \
        ${FSR}src/synth/fluid_mod.c \
        ${FSR}src/synth/fluid_mod.h \
        ${FSR}src/synth/fluid_synth.c \
        ${FSR}src/synth/fluid_synth.h \
+       ${FSR}src/synth/fluid_synth_monopoly.c \
        ${FSR}src/synth/fluid_tuning.c \
        ${FSR}src/synth/fluid_tuning.h \
        ${FSR}src/synth/fluid_voice.c \
        ${FSR}src/synth/fluid_voice.h \
        ${FSR}src/utils/fluid_conv.c \
        ${FSR}src/utils/fluid_conv.h \
+       ${FSR}src/utils/fluid_conv_tables.h \
        ${FSR}src/utils/fluid_hash.c \
        ${FSR}src/utils/fluid_hash.h \
        ${FSR}src/utils/fluid_list.c \
@@ -97,4 +103,7 @@ rsync -auc --info=progress2 \
        "$ASRC/libs/fluidsynth/fluidsynth/"
 
 cd "$ASRC"
-patch -p1 < tools/ardour_fluidsynth.diff
+patch -p1 < tools/fluid-patches/ardour_fluidsynth.diff
+
+cp tools/fluid-patches/fluid_conv_tables.c  libs/fluidsynth/src/
+cp tools/fluid-patches/fluid_rvoice_dsp_tables.c  libs/fluidsynth/src/