X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common.mak;h=c3a8b9309564a5d245904729d4aa298c566c2670;hb=8d6b1ffba0ca32bbf3915d62fa34b7b61c6a50e3;hp=d611ef8cad62f8237def979d4085da8cac88daf9;hpb=f01a276b50a52abdcde2c989e01c31a056922e76;p=ffmpeg diff --git a/common.mak b/common.mak index d611ef8cad6..c3a8b930956 100644 --- a/common.mak +++ b/common.mak @@ -18,7 +18,7 @@ ifndef SUBDIR ifndef V Q = @ ECHO = printf "$(1)\t%s\n" $(2) -BRIEF = CC CXX HOSTCC HOSTLD AS YASM AR LD STRIP CP WINDRES +BRIEF = CC CXX OBJCC HOSTCC HOSTLD AS YASM AR LD STRIP CP WINDRES SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM MSG = $@ @@ -36,6 +36,8 @@ IFLAGS := -I. -I$(SRC_PATH)/ CPPFLAGS := $(IFLAGS) $(CPPFLAGS) CFLAGS += $(ECFLAGS) CCFLAGS = $(CPPFLAGS) $(CFLAGS) +OBJCFLAGS += $(EOBJCFLAGS) +OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS) ASFLAGS := $(CPPFLAGS) $(ASFLAGS) CXXFLAGS += $(CPPFLAGS) $(CFLAGS) YASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm @@ -51,6 +53,7 @@ endef COMPILE_C = $(call COMPILE,CC) COMPILE_CXX = $(call COMPILE,CXX) COMPILE_S = $(call COMPILE,AS) +COMPILE_M = $(call COMPILE,OBJCC) COMPILE_HOSTC = $(call COMPILE,HOSTCC) %.o: %.c @@ -60,7 +63,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC) $(COMPILE_CXX) %.o: %.m - $(COMPILE_C) + $(COMPILE_M) %.s: %.c $(CC) $(CPPFLAGS) $(CFLAGS) -S -o $@ $<