diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-23 13:30:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-23 13:30:51 +0100 |
| commit | 25ca8aef54b65c77ed36ab5a6877eba18560e6b8 (patch) | |
| tree | 5e90ca85f7a2364a156154e8c9bbc8ca75018736 /library.mak | |
| parent | e9c372362cb736240dcd87658a027ecfb7b9d240 (diff) | |
| parent | 4a606c830ae664013cea33800094d4d0f4ec62da (diff) | |
| download | ffmpeg-25ca8aef54b65c77ed36ab5a6877eba18560e6b8.tar.gz | |
Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'
* commit '4a606c830ae664013cea33800094d4d0f4ec62da':
av_memcpy_backptr: optimise some special cases
mpegvideo: simplify dxy calculation in hpel_motion()
build: add rules to generate preprocessed source files
Conflicts:
Makefile
libavutil/mem.c
library.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
| -rw-r--r-- | library.mak | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/library.mak b/library.mak index 809d629d10..470795c23b 100644 --- a/library.mak +++ b/library.mak @@ -17,12 +17,19 @@ $(SUBDIR)%-test.o: $(SUBDIR)%-test.c $(SUBDIR)%-test.o: $(SUBDIR)%.c $(COMPILE_C) +$(SUBDIR)%-test.i: $(SUBDIR)%-test.c + $(CC) $(CCFLAGS) $(CC_E) $< + +$(SUBDIR)%-test.i: $(SUBDIR)%.c + $(CC) $(CCFLAGS) $(CC_E) $< + $(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm $(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d) $(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $< -$(OBJS) $(OBJS:.o=.s) $(SUBDIR)%.h.o $(TESTOBJS): CPPFLAGS += -DHAVE_AV_CONFIG_H -$(TESTOBJS): CPPFLAGS += -DTEST +LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS) +$(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i): CPPFLAGS += -DHAVE_AV_CONFIG_H +$(TESTOBJS) $(TESTOBJS:.o=.i): CPPFLAGS += -DTEST $(SUBDIR)$(LIBNAME): $(OBJS) $(RM) $@ |