mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-17 17:25:10 +00:00
Add TESTOBJS make variable for extra objects used by test apps
Originally committed as revision 22335 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
a79f59e31c
commit
2a5500b13e
2
Makefile
2
Makefile
@ -56,7 +56,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
|
|||||||
|
|
||||||
SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
|
SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
|
||||||
ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
|
ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
|
||||||
HOSTPROGS BUILT_HEADERS
|
HOSTPROGS BUILT_HEADERS TESTOBJS
|
||||||
|
|
||||||
define RESET
|
define RESET
|
||||||
$(1) :=
|
$(1) :=
|
||||||
|
@ -84,6 +84,7 @@ FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(ALLFFLIBS)) $(LDFLAGS)
|
|||||||
|
|
||||||
EXAMPLES := $(addprefix $(SUBDIR),$(addsuffix -example$(EXESUF),$(EXAMPLES)))
|
EXAMPLES := $(addprefix $(SUBDIR),$(addsuffix -example$(EXESUF),$(EXAMPLES)))
|
||||||
OBJS := $(addprefix $(SUBDIR),$(OBJS))
|
OBJS := $(addprefix $(SUBDIR),$(OBJS))
|
||||||
|
TESTOBJS := $(addprefix $(SUBDIR),$(TESTOBJS))
|
||||||
TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS)))
|
TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS)))
|
||||||
HOSTOBJS := $(addprefix $(SUBDIR),$(addsuffix .o,$(HOSTPROGS)))
|
HOSTOBJS := $(addprefix $(SUBDIR),$(addsuffix .o,$(HOSTPROGS)))
|
||||||
HOSTPROGS := $(addprefix $(SUBDIR),$(addsuffix $(HOSTEXESUF),$(HOSTPROGS)))
|
HOSTPROGS := $(addprefix $(SUBDIR),$(addsuffix $(HOSTEXESUF),$(HOSTPROGS)))
|
||||||
|
@ -720,6 +720,7 @@ EXAMPLES = api
|
|||||||
TESTPROGS = cabac dct eval fft h264 iirfilter rangecoder snow
|
TESTPROGS = cabac dct eval fft h264 iirfilter rangecoder snow
|
||||||
TESTPROGS-$(ARCH_X86) += x86/cpuid
|
TESTPROGS-$(ARCH_X86) += x86/cpuid
|
||||||
TESTPROGS-$(HAVE_MMX) += motion
|
TESTPROGS-$(HAVE_MMX) += motion
|
||||||
|
TESTOBJS = dctref.o
|
||||||
|
|
||||||
HOSTPROGS = costablegen
|
HOSTPROGS = costablegen
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ include $(SUBDIR)../common.mak
|
|||||||
LIBVERSION := $(lib$(NAME)_VERSION)
|
LIBVERSION := $(lib$(NAME)_VERSION)
|
||||||
LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
|
LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
|
||||||
|
|
||||||
$(OBJS) $(SUBDIR)%.ho $(SUBDIR)%-test.o: CPPFLAGS += -DHAVE_AV_CONFIG_H
|
$(OBJS) $(SUBDIR)%.ho $(SUBDIR)%-test.o $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H
|
||||||
|
|
||||||
ifdef CONFIG_STATIC
|
ifdef CONFIG_STATIC
|
||||||
all: $(SUBDIR)$(LIBNAME)
|
all: $(SUBDIR)$(LIBNAME)
|
||||||
|
Loading…
Reference in New Issue
Block a user