X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common.mak;h=e306cefba671fd91b2b4c610244fca4e41fcda0a;hb=8d1de449f0062682f8562fc0a96b13dfaa3723e7;hp=b7786c5c6746b04de231ea8e5787d4f38c823dbc;hpb=967facb6950549d0cc4e0ba79a056ebc6f93a049;p=ffmpeg diff --git a/common.mak b/common.mak index b7786c5c674..e306cefba67 100644 --- a/common.mak +++ b/common.mak @@ -20,7 +20,7 @@ $(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR)))) $(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_DIR)/%=%)); $(INSTALL)) endif -ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale swresample +ALLFFLIBS = avcodec avdevice avfilter avformat avresample avutil postproc swscale swresample # NASM requires -I path terminated with / IFLAGS := -I. -I$(SRC_PATH)/ @@ -73,7 +73,7 @@ COMPILE_S = $(call COMPILE,AS) $(OBJS): endif -OBJS-$(HAVE_MMX) += $(MMX-OBJS-yes) +include $(SRC_PATH)/arch.mak OBJS += $(OBJS-yes) FFLIBS := $(FFLIBS-yes) $(FFLIBS) @@ -115,6 +115,6 @@ OBJDIRS := $(OBJDIRS) $(dir $(OBJS) $(HOSTOBJS) $(TESTOBJS)) CLEANSUFFIXES = *.d *.o *~ *.ho *.map *.ver *.gcno *.gcda DISTCLEANSUFFIXES = *.pc -LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp +LIBSUFFIXES = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a -include $(wildcard $(OBJS:.o=.d) $(TESTOBJS:.o=.d))