RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

suppressed nasm stuff 

Originally committed as revision 108 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2001-08-15 22:30:51 +00:00
parent daf8e9557d
commit 4300403eca
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/Makefile
View File

@ -25,10 +25,9 @@ endif
# i386 mmx specific stuff # i386 mmx specific stuff
ifeq ($(TARGET_MMX),yes) ifeq ($(TARGET_MMX),yes)
ASM_OBJS += i386/fdct_mmx.o i386/sad_mmx.o OBJS += i386/fdct_mmx.o i386/cputest.o \
OBJS += i386/fdctdata.o i386/cputest.o \
i386/dsputil_mmx.o i386/mpegvideo_mmx.o \ i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
i386/idct_mmx.o i386/idct_mmx.o i386/motion_est_mmx.o
endif endif
# armv4l specific stuff # armv4l specific stuff
@ -40,7 +39,7 @@ endif
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s) SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
LIB= libavcodec.a LIB= libavcodec.a
TESTS= imgresample-test dct-test TESTS= imgresample-test dct-test motion-test
all: $(LIB) all: $(LIB)
tests: apiexample cpuid_test $(TESTS) tests: apiexample cpuid_test $(TESTS)
@ -57,9 +56,6 @@ dsputil.o: dsputil.c dsputil.h
%.o: %.S %.o: %.S
$(CC) $(CFLAGS) -c -o $@ $< $(CC) $(CFLAGS) -c -o $@ $<
%.o: %.s
nasm -f elf -o $@ $<
# depend only used by mplayer now # depend only used by mplayer now
dep: depend dep: depend
@ -89,10 +85,13 @@ cpuid_test: i386/cputest.c
imgresample-test: imgresample.c imgresample-test: imgresample.c
$(CC) $(CFLAGS) -DTEST -o $@ $^ $(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 fdctref.o jrevdct.o i386/idct_mmx.o
$(CC) -o $@ $^ $(CC) -o $@ $^
motion-test: motion_test.o $(LIB)
$(CC) -o $@ $^
# #
# include dependency files if they exist # include dependency files if they exist
# #