mirror of
https://github.com/mpv-player/mpv
synced 2025-01-31 20:21:49 +00:00
Fix linking of liba52 test program when internal liba52 is disabled.
Dependencies were only set correctly if internal liba52 was enabled. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30527 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
edf4053b98
commit
05b63e5ded
6
Makefile
6
Makefile
@ -107,7 +107,7 @@ SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c osdep/mmap_anon.c
|
||||
SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c
|
||||
SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c
|
||||
SRCS_COMMON-$(LIBA52) += libmpcodecs/ad_liba52.c
|
||||
SRCS_COMMON-$(LIBA52_INTERNAL) += liba52/crc.c \
|
||||
SRCS_LIBA52_INTERNAL += liba52/crc.c \
|
||||
liba52/resample.c \
|
||||
liba52/bit_allocate.c \
|
||||
liba52/bitstream.c \
|
||||
@ -115,6 +115,8 @@ SRCS_COMMON-$(LIBA52_INTERNAL) += liba52/crc.c \
|
||||
liba52/imdct.c \
|
||||
liba52/parse.c \
|
||||
|
||||
SRCS_COMMON-$(LIBA52_INTERNAL) += $(SRCS_LIBA52_INTERNAL)
|
||||
|
||||
SRCS_COMMON-$(LIBASS) += libmpcodecs/vf_ass.c \
|
||||
libass/ass_mp.c \
|
||||
|
||||
@ -1005,7 +1007,7 @@ codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(TEST_OBJS)
|
||||
codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS)
|
||||
$(CC) -I. -DCODECS2HTML -o $@ $^
|
||||
|
||||
liba52/test$(EXESUF): cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) -lm
|
||||
liba52/test$(EXESUF): cpudetect.o $(SRCS_LIBA52_INTERNAL:.c=.o) -lm
|
||||
|
||||
libvo/aspecttest$(EXESUF): libvo/aspect.o libvo/geometry.o $(TEST_OBJS)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user