Finish compilation of FluidSynth on Windows.
authorJean-Baptiste Kempf <jb@videolan.org>
Tue, 28 Jul 2009 21:43:26 +0000 (23:43 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 28 Jul 2009 21:47:51 +0000 (23:47 +0200)
NEVER TESTED.

extras/contrib/src/Makefile
extras/contrib/src/Patches/fluid-win32.patch
modules/codec/fluidsynth.c

index 9f019e0..9b5d3ee 100644 (file)
@@ -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
index eb270ae..e5c8eaa 100644 (file)
@@ -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}
index 74c44fa..da77b32 100644 (file)
 #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)")