X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=57f6a91c477115f63ba388a445653da108d0cf03;hb=5f08b417b4c0493f9aebe891c9991654acd737ed;hp=86b3508425a126c7a96411e3da9ada74f94a006e;hpb=cd4497d8c5c4dc7b06a2b2509bbdbfa9c6831c62;p=ffmpeg diff --git a/Makefile b/Makefile index 86b3508425a..57f6a91c477 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ FF_DEP_LIBS := $(DEP_LIBS) all: $(AVPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS) - $(LD) $(LDFLAGS) $(LD_O) $^ $(ELIBS) + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) @@ -92,6 +92,7 @@ $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) SUBDIR := $(1)/ include $(SRC_PATH)/$(1)/Makefile -include $(SRC_PATH)/$(1)/$(ARCH)/Makefile +-include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile include $(SRC_PATH)/library.mak endef @@ -117,7 +118,7 @@ $(PROGS): %$(PROGSSUF)$(EXESUF): %$(PROGSSUF)_g$(EXESUF) $(STRIP) $@ %$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS) - $(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) OBJDIRS += tools