summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b6c7050)
Again, the --with-opus-headers option was ignored completely. In fact
opus_cppflags was not even mentioned in Makefile.in.
Fix this and also convert opus_ldflags as usual.
MKDIR_P := mkdir -p
speex_cppflags := @speex_cppflags@
MKDIR_P := mkdir -p
speex_cppflags := @speex_cppflags@
+opus_cppflags := @opus_cppflags@
id3tag_ldflags := @id3tag_ldflags@
ogg_ldflags := @ogg_ldflags@
vorbis_ldflags := @vorbis_ldflags@
speex_ldflags := @speex_ldflags@
id3tag_ldflags := @id3tag_ldflags@
ogg_ldflags := @ogg_ldflags@
vorbis_ldflags := @vorbis_ldflags@
speex_ldflags := @speex_ldflags@
+opus_ldflags := @opus_ldflags@
build_date := $(shell date)
uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
build_date := $(shell date)
uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
@[ -z "$(Q)" ] || echo 'CC $<'
$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
@[ -z "$(Q)" ] || echo 'CC $<'
$(Q) $(CC) -c -o $@ $(CPPFLAGS) $(DEBUG_CPPFLAGS) @faad_cppflags@ $<
+$(object_dir)/opus%.o: CPPFLAGS += $(opus_cppflags)
$(object_dir)/mp3_afh.o: CPPFLAGS += @id3tag_cppflags@
$(object_dir)/mp3_afh.o: mp3_afh.c | $(object_dir)
$(object_dir)/mp3_afh.o: CPPFLAGS += @id3tag_cppflags@
$(object_dir)/mp3_afh.o: mp3_afh.c | $(object_dir)
para_play \
para_afh \
para_recv \
para_play \
para_afh \
para_recv \
-: LDFLAGS += $(ogg_ldflags) $(vorbis_ldflags) $(speex_ldflags)
+: LDFLAGS += $(ogg_ldflags) $(vorbis_ldflags) $(speex_ldflags) $(opus_ldflags)
fi
if test "$have_opus" = "yes"; then
AC_DEFINE(HAVE_OPUS, 1, define to 1 to turn on ogg/opus support)
fi
if test "$have_opus" = "yes"; then
AC_DEFINE(HAVE_OPUS, 1, define to 1 to turn on ogg/opus support)
+ AC_SUBST(opus_cppflags)
+ opus_ldflags="$opus_libs -lopus"
+ AC_SUBST(opus_ldflags)
+
filters="$filters opusdec"
filters="$filters opusdec"
- opus_libs="-lopus"
- server_ldflags="$server_ldflags $opus_libs"
- filter_ldflags="$filter_ldflags $opus_libs"
- audiod_ldflags="$audiod_ldflags $opus_libs"
- afh_ldflags="$afh_ldflags $opus_libs"
- play_ldflags="$play_ldflags $opus_libs"
- recv_ldflags="$recv_ldflags $opus_libs"
server_errlist_objs="$server_errlist_objs opus_afh opus_common"
filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
server_errlist_objs="$server_errlist_objs opus_afh opus_common"
filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"