diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2001-08-15 22:30:51 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2001-08-15 22:30:51 +0000 |
| commit | 4300403eca3e9071f09bcd7871cf0c3eab5bdfef (patch) | |
| tree | a2a7183a41847056731fa520ea9b531621f990fa /libavcodec | |
| parent | daf8e9557d55d13d45b83329db59f711fb9c7251 (diff) | |
| download | ffmpeg-streaming-4300403eca3e9071f09bcd7871cf0c3eab5bdfef.zip ffmpeg-streaming-4300403eca3e9071f09bcd7871cf0c3eab5bdfef.tar.gz | |
suppressed nasm stuff
Originally committed as revision 108 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8738ddd..1c34c1c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -25,10 +25,9 @@ endif # i386 mmx specific stuff ifeq ($(TARGET_MMX),yes) -ASM_OBJS += i386/fdct_mmx.o i386/sad_mmx.o -OBJS += i386/fdctdata.o i386/cputest.o \ +OBJS += i386/fdct_mmx.o i386/cputest.o \ i386/dsputil_mmx.o i386/mpegvideo_mmx.o \ - i386/idct_mmx.o + i386/idct_mmx.o i386/motion_est_mmx.o endif # armv4l specific stuff @@ -40,7 +39,7 @@ endif SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) LIB= libavcodec.a -TESTS= imgresample-test dct-test +TESTS= imgresample-test dct-test motion-test all: $(LIB) tests: apiexample cpuid_test $(TESTS) @@ -57,9 +56,6 @@ dsputil.o: dsputil.c dsputil.h %.o: %.S $(CC) $(CFLAGS) -c -o $@ $< -%.o: %.s - nasm -f elf -o $@ $< - # depend only used by mplayer now dep: depend @@ -89,10 +85,13 @@ cpuid_test: i386/cputest.c imgresample-test: imgresample.c $(CC) $(CFLAGS) -DTEST -o $@ $^ -dct-test: dct-test.o jfdctfst.o i386/fdct_mmx.o i386/fdctdata.o \ +dct-test: dct-test.o jfdctfst.o i386/fdct_mmx.o \ fdctref.o jrevdct.o i386/idct_mmx.o $(CC) -o $@ $^ +motion-test: motion_test.o $(LIB) + $(CC) -o $@ $^ + # # include dependency files if they exist # |
