Finish compilation of FluidSynth on Windows.

NEVER TESTED.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 9f019e03e442f0e2c8869ad093f2278e4d024e74..9b5d3ee0559f9fa8604e2dc53a0749480359ddc6 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2425,7 +2425,6 @@ DISTCLEAN_PKG += ncurses-$(NCURSES_VERSION).tar.gz
 fluidsynth-$(FLUID_VERSION).tar.gz:
        $(WGET) $(FLUID_URL)
 
-
 fluidsynth: fluidsynth-$(FLUID_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_WIN32

diff --git a/extras/contrib/src/Patches/fluid-win32.patch b/extras/contrib/src/Patches/fluid-win32.patch
index eb270ae3a9d5381c9eaf746e6e5db6a3943ada9b..e5c8eaa6f32a202d2c95f39bdbdf48863e459b39 100644 (file)
--- a/extras/contrib/src/Patches/fluid-win32.patch
+++ b/extras/contrib/src/Patches/fluid-win32.patch
@@ -9,3 +9,12 @@
  
  libfluidsynth_la_SOURCES = \
        $(fluid_alsa) \
+--- fluidsynth/fluidsynth.pc.in        2007-08-18 23:55:32.000000000 +0200
++++ fluidsynth.new/fluidsynth.pc.in    2009-07-28 23:41:05.000000000 +0200
+@@ -6,5 +6,5 @@
+ Name: FluidSynth
+ Description: Software SoundFont synth
+ Version: @VERSION@
+-Libs: -L${libdir} -lfluidsynth
++Libs: -L${libdir} -lfluidsynth -ldsound -lwinmm
+ Cflags: -I${includedir}

diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index 74c44fa3ee7c54d5f42ae110ff546d2139636261..da77b32117ba111d985e1df9fca3076130c9feae 100644 (file)
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -28,6 +28,11 @@
 #include <vlc_aout.h>
 #include <vlc_codec.h>
 
+/* On Win32, we link statically */
+#ifdef WIN32
+# define FLUIDSYNTH_NOT_A_DLL
+#endif
+
 #include <fluidsynth.h>
 
 #define SOUNDFONT_TEXT N_("Sound fonts (required)")