summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 16:40:22 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 16:40:22 +0200
commitf4a1d6e36eb2e9a92894ea42276f9e1087c4bd57 (patch)
tree317333856e8053ce771dc38707ee25edff4bb5f8 /Makefile
parent00323c06e2b8451e68f4fe31ddb871366e5793c2 (diff)
downloadmpv-f4a1d6e36eb2e9a92894ea42276f9e1087c4bd57.tar.bz2
mpv-f4a1d6e36eb2e9a92894ea42276f9e1087c4bd57.tar.xz
Makefile: fix %.S rule (broke loader build on x86)
The rule merged from svn used "ASFLAGS" which was set for FFmpeg only. Change it to use CFLAGS instead (ASFLAGS is the same in svn).
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6d804f38a0..2f1ef50364 100644
--- a/Makefile
+++ b/Makefile
@@ -756,7 +756,7 @@ all: $(ALL_PRG-yes)
$(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
%.o: %.S
- $(CC) $(ASFLAGS) -c -o $@ $<
+ $(CC) $(CFLAGS) -c -o $@ $<
%-rc.o: %.rc
$(WINDRES) -I. $< $@