aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2008-08-16 04:17:54 +0000
committerEric Wong <normalperson@yhbt.net>2008-08-16 04:17:54 +0000
commitf9f70860622613686e6ac0bf7ebd448f437d92a7 (patch)
tree40db43350aaee44d072610a008d2f91aeced32c3
parenta889684acdabb5936813f047439937f842221ce1 (diff)
downloadmpd-f9f70860622613686e6ac0bf7ebd448f437d92a7.tar.gz
mpd-f9f70860622613686e6ac0bf7ebd448f437d92a7.tar.xz
mpd-f9f70860622613686e6ac0bf7ebd448f437d92a7.zip
bs: better support for mp4/faad/aac and wavpack buildssvn/trunk
* Correctly define the following CPP directives: HAVE_FAAD_BUFLEN_FUNCS HAVE_MP4AUDIOSPECIFICCONFIG * link against libwavpack correctly in bs * fix include path for the mpd config.h for mp4ff git-svn-id: https://svn.musicpd.org/mpd/trunk@7399 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--bs/config.mk.default2
-rw-r--r--bs/deps-input.mk5
-rw-r--r--bs/mkconfig.h.mk3
-rwxr-xr-xbuild.mk2
4 files changed, 8 insertions, 4 deletions
diff --git a/bs/config.mk.default b/bs/config.mk.default
index be46f5e78..765cda236 100644
--- a/bs/config.mk.default
+++ b/bs/config.mk.default
@@ -47,6 +47,8 @@ HAVE_SHOUT :=
#
HAVE_AUDIOFILE :=
HAVE_FAAD :=
+HAVE_FAAD_BUFLEN_FUNCS :=
+HAVE_MP4AUDIOSPECIFICCONFIG :=
HAVE_FAACDECCONFIGURATION_DONTUPSAMPLEIMPLICITSBR :=
HAVE_FAACDECCONFIGURATION_DOWNMATRIX :=
HAVE_FAACDECFRAMEINFO_SAMPLERATE :=
diff --git a/bs/deps-input.mk b/bs/deps-input.mk
index b9f13b471..c45a788b6 100644
--- a/bs/deps-input.mk
+++ b/bs/deps-input.mk
@@ -41,5 +41,6 @@ ifeq ($(HAVE_OGGVORBIS),1)
endif
endif
-
-
+ifeq ($(HAVE_WAVPACK),1)
+ mpd_LDFLAGS += -lwavpack
+endif
diff --git a/bs/mkconfig.h.mk b/bs/mkconfig.h.mk
index 816eb4f2e..8466fb83c 100644
--- a/bs/mkconfig.h.mk
+++ b/bs/mkconfig.h.mk
@@ -7,6 +7,7 @@ have += FAACDECCONFIGURATION_DONTUPSAMPLEIMPLICITSBR
have += FAACDECCONFIGURATION_DOWNMATRIX
have += FAACDECFRAMEINFO_SAMPLERATE
have += MP4AUDIOSPECIFICCONFIG
+have += FAAD_BUFLEN_FUNCS
have += FLAC
have += HELIXMP3
have += MIKMOD
@@ -15,7 +16,7 @@ have += MPCDEC
have += OGGFLAC
have += OGGVORBIS
have += TREMOR
-
+have += WAVPACK
have += ALSA
have += AO
have += FIFO
diff --git a/build.mk b/build.mk
index 6962d00c2..a8f46525c 100755
--- a/build.mk
+++ b/build.mk
@@ -42,7 +42,7 @@ ifneq ($(HOST),$(build))
endif
endif
-mpd_CFLAGS += -I$(O)/src
+mpd_CFLAGS += -I$(O)/src -I$(O)
mpd_LDFLAGS += -lm
mpd_DIRS := $(O)/src/inputPlugins $(O)/src/audioOutputs