diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:25:15 +0200 |
commit | acdce0176ae3722ad38a23aae0cf0bf03a82f9c4 (patch) | |
tree | 57a30f1d44ea193586d5723faac7ffb96a3a73aa /Makefile | |
parent | ef3ef5e218588b5f68b427729a3c2c1a8083e499 (diff) | |
parent | 5a2289137f43501281dba83fe98b5f67be63f9ef (diff) | |
download | mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.bz2 mpv-acdce0176ae3722ad38a23aae0cf0bf03a82f9c4.tar.xz |
Merge svn changes up to r30732
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -21,6 +21,7 @@ include config.mak +.SUFFIXES: ###### variable declarations ####### @@ -752,6 +753,9 @@ all: $(ALL_PRG-yes) %.ho: %.h $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< +%.o: %.S + $(CC) $(ASFLAGS) -c -o $@ $< + %-rc.o: %.rc $(WINDRES) -I. $< $@ |