X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=common.mak;h=03b51c59688479f175fbb4b5098903b92b603ac2;hb=0e3e3656d31a7e1e595ccb5ca3acfc76a23d785e;hp=c3a8b9309564a5d245904729d4aa298c566c2670;hpb=7fe77aa62ea2ca376057436a6c36a759e8273f15;p=ffmpeg diff --git a/common.mak b/common.mak index c3a8b930956..03b51c59688 100644 --- a/common.mak +++ b/common.mak @@ -32,7 +32,7 @@ endif ALLFFLIBS = avcodec avdevice avfilter avformat avresample avutil postproc swscale swresample # NASM requires -I path terminated with / -IFLAGS := -I. -I$(SRC_PATH)/ +IFLAGS := -I. -I$(SRC_LINK)/ CPPFLAGS := $(IFLAGS) $(CPPFLAGS) CFLAGS += $(ECFLAGS) CCFLAGS = $(CPPFLAGS) $(CFLAGS) @@ -47,7 +47,7 @@ LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS) define COMPILE $(call $(1)DEP,$(1)) - $($(1)) $($(1)FLAGS) $($(1)_DEPFLAGS) $($(1)_C) $($(1)_O) $< + $($(1)) $($(1)FLAGS) $($(1)_DEPFLAGS) $($(1)_C) $($(1)_O) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) endef COMPILE_C = $(call COMPILE,CC) @@ -66,7 +66,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC) $(COMPILE_M) %.s: %.c - $(CC) $(CPPFLAGS) $(CFLAGS) -S -o $@ $< + $(CC) $(CCFLAGS) -S -o $@ $< %.o: %.S $(COMPILE_S)