diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 09:39:09 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 09:39:09 +0300 |
commit | 2b47fd59ab442ee27db9cfc4e7ebcdba93bab57b (patch) | |
tree | a083736322f89e8a0440f52c82c0922fc084798f /mpcommon.mak | |
parent | 2993acdc3118ec01274cf357336760443bfce561 (diff) | |
parent | 59f2911c3ec64fcb9db8ac8e1216cf01506cac29 (diff) |
Merge svn changes up to r26540
Conflicts:
Makefile
Diffstat (limited to 'mpcommon.mak')
-rw-r--r-- | mpcommon.mak | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mpcommon.mak b/mpcommon.mak index d200560bf8..2cdcf7f266 100644 --- a/mpcommon.mak +++ b/mpcommon.mak @@ -1,4 +1,5 @@ SRCS_COMMON += $(SRCS_COMMON-yes) +SRCS_COMMON += $(SRCS_COMMON-yes-yes) SRCS_MPLAYER += $(SRCS_MPLAYER-yes) SRCS_MENCODER += $(SRCS_MENCODER-yes) @@ -33,6 +34,9 @@ distclean:: clean %.d: %.c $(MPDEPEND_CMD) > $@ +%.d: %.cpp + $(MPDEPEND_CMD_CXX) > $@ + %.ho: %.h $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< |