---
Updated to match the change to "x86-asm" in the previous patch.
Makefile | 6 +++---
configure | 8 ++++++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index a049afd..d1b0374 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ CCFLAGS = $(CPPFLAGS) $(CFLAGS)
OBJCFLAGS += $(EOBJCFLAGS)
OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)
ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
-X86_ASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm
+X86_ASMFLAGS += $(IFLAGS:%=%/) -I$(<D)/ -Pconfig.asm
HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS)
@@ -42,6 +42,7 @@ endef
COMPILE_C = $(call COMPILE,CC)
COMPILE_S = $(call COMPILE,AS)
COMPILE_M = $(call COMPILE,OBJCC)
+COMPILE_X86_ASM = $(call COMPILE,X86_ASM)
COMPILE_HOSTC = $(call COMPILE,HOSTCC)
%.o: %.c
@@ -57,8 +58,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
$(COMPILE_HOSTC)
%.o: %.asm
- $(DEPX86_ASM) $(X86_ASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
- $(X86_ASM) $(X86_ASMFLAGS) -I $(<D)/ -o $@ $<
+ $(COMPILE_X86_ASM)
-$(STRIP) $(STRIPFLAGS) $@
%.i: %.c
diff --git a/configure b/configure
index bcac50e..bdca71b 100755
--- a/configure
+++ b/configure
@@ -2601,6 +2601,7 @@ CC_O='-o $@'
OBJCC_C='-c'
OBJCC_E='-E -o $@'
OBJCC_O='-o $@'
+X86_ASM_O='-o $@'
LD_O='-o $@'
LD_LIB='-l%'
LD_PATH='-L'
@@ -4433,9 +4434,11 @@ EOF
if check_cmd $x86_asmexe --version; then
enabled x86_64 && x86_asm_extra="-m amd64"
x86_asm_debug="-g dwarf2"
+ X86_ASMDEP='$(DEPX86_ASM) $(X86_ASMFLAGS) -M -o $@ $< > $(@:.o=.d)'
elif check_cmd nasm -v; then
x86_asmexe=nasm
x86_asm_debug="-g -F dwarf"
+ X86_ASM_DEPFLAGS='-MD $(@:.o=.d)'
enabled x86_64 && test "$objformat" = elf && objformat=elf64
fi
@@ -5259,6 +5262,7 @@ DEPAS=$as
DEPASFLAGS=$DEPASFLAGS \$(CPPFLAGS)
X86_ASM=$x86_asmexe
DEPX86_ASM=$x86_asmexe
+DEPX86_ASMFLAGS=\$(X86_ASMFLAGS)
AR=$ar
ARFLAGS=$arflags
AR_O=$ar_o
@@ -5277,6 +5281,7 @@ OBJCC_O=$OBJCC_O
CC_C=$CC_C
CC_E=$CC_E
CC_O=$CC_O
+X86_ASM_O=$X86_ASM_O
LD_O=$LD_O
LD_LIB=$LD_LIB
LD_PATH=$LD_PATH
@@ -5297,8 +5302,11 @@ CCDEP=$CCDEP
CCDEP_FLAGS=$CCDEP_FLAGS
ASDEP=$ASDEP
ASDEP_FLAGS=$ASDEP_FLAGS
+ASMDEP=$ASMDEP
+ASMDEP_FLAGS=$ASMDEP_FLAGS
CC_DEPFLAGS=$CC_DEPFLAGS
AS_DEPFLAGS=$AS_DEPFLAGS
+ASM_DEPFLAGS=$ASM_DEPFLAGS
HOSTCC=$host_cc
HOSTLD=$host_ld
HOSTCFLAGS=$host_cflags
--
2.1.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
