summaryrefslogtreecommitdiffstats
path: root/common.mak
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-12-22 09:20:38 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-12-22 09:20:38 +0000
commit08de71edb1234a58084f0431e2d1887a9f500d8c (patch)
tree9e4e91b6bdcfe3a48effce7ba7d0bdcdf6b45771 /common.mak
parent91748b4278a02f4c9b0e42ebfe917e43fcb39155 (diff)
downloadmpv-08de71edb1234a58084f0431e2d1887a9f500d8c.tar.bz2
mpv-08de71edb1234a58084f0431e2d1887a9f500d8c.tar.xz
Sync with latest FFmpeg changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28178 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'common.mak')
-rw-r--r--common.mak4
1 files changed, 2 insertions, 2 deletions
diff --git a/common.mak b/common.mak
index d4c1f14862..8ac6ee07ad 100644
--- a/common.mak
+++ b/common.mak
@@ -91,10 +91,10 @@ $(SUBDIR)%-test.o: $(SUBDIR)%.c
$(SUBDIR)%-test.o: $(SUBDIR)%-test.c
$(CC) $(CFLAGS) -DTEST -c -o $$@ $$^
-$(SUBDIR)i386/%.o: $(SUBDIR)i386/%.asm
+$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
$(YASM) $(YASMFLAGS) -I $$(<D)/ -o $$@ $$<
-$(SUBDIR)i386/%.d: $(SUBDIR)i386/%.asm
+$(SUBDIR)x86/%.d: $(SUBDIR)x86/%.asm
$(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$(@:%.d=%.o) $$< > $$@
clean::