[vlc-devel] commit: Finish compilation of FluidSynth on Windows. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jul 28 23:43:26 2009 +0200| [d611011802b408a7d5ee037d4a1b50a0e486ccca] | committer: Jean-Baptiste Kempf 

Finish compilation of FluidSynth on Windows.

NEVER TESTED.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d611011802b408a7d5ee037d4a1b50a0e486ccca
---

 extras/contrib/src/Makefile                  |    1 -
 extras/contrib/src/Patches/fluid-win32.patch |    9 +++++++++
 modules/codec/fluidsynth.c                   |    5 +++++
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 9f019e0..9b5d3ee 100644
--- 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 eb270ae..e5c8eaa 100644
--- 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 74c44fa..da77b32 100644
--- 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)")