zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-10 15:01:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Actual checkin of -Wno-cast-qual warning inhibitor (wasn't actually checked in in r264).

Browse source 
Added example source files and fluidsynth-v11-devdoc.txt in doc/ to EXTRA_DIST.
Added work around in fluid_coremidi.c for OSX 10.4.
This commit is contained in:
Josh Green 2009-11-07 03:26:19 +00:00
parent 7eeb88d42f
commit 8f63cef0aa
3 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fluidsynth/configure.ac
View file

@ -145,10 +145,10 @@ AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],
ENABLE_DEBUG=$enableval) ENABLE_DEBUG=$enableval)
if test "$ENABLE_DEBUG" = "yes"; then if test "$ENABLE_DEBUG" = "yes"; then
CFLAGS="${CFLAGS} ${FCCFLAGS} -g -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wno-unused-parameter" CFLAGS="${CFLAGS} ${FCCFLAGS} -g -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wno-unused-parameter -Wno-cast-qual"
AC_DEFINE(DEBUG, 1, [Define to activate debugging message]) AC_DEFINE(DEBUG, 1, [Define to activate debugging message])
else else
CFLAGS="${CFLAGS} ${FCCFLAGS} -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Winline -Wno-unused-parameter" CFLAGS="${CFLAGS} ${FCCFLAGS} -O2 -fomit-frame-pointer -funroll-all-loops -finline-functions -Wall -W -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Winline -Wno-unused-parameter -Wno-cast-qual"
AC_DEFINE(DEBUG, 0, [Define to activate debugging message]) AC_DEFINE(DEBUG, 0, [Define to activate debugging message])
fi fi

15
fluidsynth/doc/Makefile.am
View file

@ -1,7 +1,18 @@
# install the man pages and include in distribution # install the man pages and include in distribution
man_MANS = fluidsynth.1 man_MANS = fluidsynth.1
EXTRA_DIST = $(man_MANS) Doxyfile example.c fluidsynth.1 \
fluidsynth-v10-devdoc.xml FluidSynth-LADSPA.pdf EXTRA_DIST = \
$(man_MANS) \
Doxyfile \
example.c \
fluidsynth-v10-devdoc.xml \
fluidsynth-v11-devdoc.txt \
fluidsynth_arpeggio.c \
fluidsynth_fx.c \
fluidsynth_metronome.c \
fluidsynth_simple.c \
xtrafluid.txt \
FluidSynth-LADSPA.pdf
docbook_docs = fluidsynth-v10-devdoc.xml docbook_docs = fluidsynth-v10-devdoc.xml

16
fluidsynth/src/fluid_coremidi.c
View file

@ -32,6 +32,22 @@
#include "fluid_mdriver.h" #include "fluid_mdriver.h"
#include "fluid_settings.h" #include "fluid_settings.h"
/* Work around for OSX 10.4 */
/* enum definition in OpenTransportProviders.h defines these tokens
which are #defined from <netinet/tcp.h> */
#ifdef TCP_NODELAY
#undef TCP_NODELAY
#endif
#ifdef TCP_MAXSEG
#undef TCP_MAXSEG
#endif
#ifdef TCP_KEEPALIVE
#undef TCP_KEEPALIVE
#endif
/* End work around */
#include <unistd.h> #include <unistd.h>
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#include <CoreMIDI/MIDIServices.h> #include <CoreMIDI/MIDIServices.h>