Skip to content

M
mpd
Commit f9f70860 authored by Eric Wong's avatar Eric Wong
Browse files
Options

bs: better support for mp4/faad/aac and wavpack builds

* 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
parent a889684a
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
bs/config.mk.default
View file @ f9f70860
...@@ -47,6 +47,8 @@ HAVE_SHOUT := ...@@ -47,6 +47,8 @@ HAVE_SHOUT :=
# #
HAVE_AUDIOFILE := HAVE_AUDIOFILE :=
HAVE_FAAD := HAVE_FAAD :=
HAVE_FAAD_BUFLEN_FUNCS :=
HAVE_MP4AUDIOSPECIFICCONFIG :=
HAVE_FAACDECCONFIGURATION_DONTUPSAMPLEIMPLICITSBR := HAVE_FAACDECCONFIGURATION_DONTUPSAMPLEIMPLICITSBR :=
HAVE_FAACDECCONFIGURATION_DOWNMATRIX := HAVE_FAACDECCONFIGURATION_DOWNMATRIX :=
HAVE_FAACDECFRAMEINFO_SAMPLERATE := HAVE_FAACDECFRAMEINFO_SAMPLERATE :=
......
bs/deps-input.mk
View file @ f9f70860
...@@ -41,5 +41,6 @@ ifeq ($(HAVE_OGGVORBIS),1) ...@@ -41,5 +41,6 @@ ifeq ($(HAVE_OGGVORBIS),1)
endif endif
endif endif
ifeq ($(HAVE_WAVPACK),1)
mpd_LDFLAGS += -lwavpack
endif
bs/mkconfig.h.mk
View file @ f9f70860
...@@ -7,6 +7,7 @@ have += FAACDECCONFIGURATION_DONTUPSAMPLEIMPLICITSBR ...@@ -7,6 +7,7 @@ have += FAACDECCONFIGURATION_DONTUPSAMPLEIMPLICITSBR
have += FAACDECCONFIGURATION_DOWNMATRIX have += FAACDECCONFIGURATION_DOWNMATRIX
have += FAACDECFRAMEINFO_SAMPLERATE have += FAACDECFRAMEINFO_SAMPLERATE
have += MP4AUDIOSPECIFICCONFIG have += MP4AUDIOSPECIFICCONFIG
have += FAAD_BUFLEN_FUNCS
have += FLAC have += FLAC
have += HELIXMP3 have += HELIXMP3
have += MIKMOD have += MIKMOD
...@@ -15,7 +16,7 @@ have += MPCDEC ...@@ -15,7 +16,7 @@ have += MPCDEC
have += OGGFLAC have += OGGFLAC
have += OGGVORBIS have += OGGVORBIS
have += TREMOR have += TREMOR
have += WAVPACK
have += ALSA have += ALSA
have += AO have += AO
have += FIFO have += FIFO
......
build.mk
View file @ f9f70860
...@@ -42,7 +42,7 @@ ifneq ($(HOST),$(build)) ...@@ -42,7 +42,7 @@ ifneq ($(HOST),$(build))
endif endif
endif endif
mpd_CFLAGS += -I$(O)/src mpd_CFLAGS += -I$(O)/src -I$(O)
mpd_LDFLAGS += -lm mpd_LDFLAGS += -lm
mpd_DIRS := $(O)/src/inputPlugins $(O)/src/audioOutputs mpd_DIRS := $(O)/src/inputPlugins $(O)/src/audioOutputs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment