diff options
| author | Max Lingua | 2014-01-24 19:27:41 -0500 |
|---|---|---|
| committer | Max Lingua | 2014-01-24 19:27:41 -0500 |
| commit | 4592e0b586829fade4a5c800672849e693a0d151 (patch) | |
| tree | d24505a169309d6c5d5b1df0ddf0c982111aaeeb /Makefile.common | |
| parent | 50bb717bccbf8b6f901f1531e93adf375ea53a5e (diff) | |
| parent | 68836e00c9259b441628071f47f558e5f0bd0e45 (diff) | |
| download | scummvm-rg350-4592e0b586829fade4a5c800672849e693a0d151.tar.gz scummvm-rg350-4592e0b586829fade4a5c800672849e693a0d151.tar.bz2 scummvm-rg350-4592e0b586829fade4a5c800672849e693a0d151.zip | |
Merge remote-tracking branch 'local/master'
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.common b/Makefile.common index b56300a115..31bb83edc1 100644 --- a/Makefile.common +++ b/Makefile.common @@ -61,6 +61,7 @@ endif ifneq ($(findstring $(MAKEFLAGS),s),s) ifneq ($(VERBOSE_BUILD),1) ifneq ($(VERBOSE_BUILD),yes) +QUIET_CC = @echo ' ' C ' ' $@; QUIET_CXX = @echo ' ' C++ ' ' $@; QUIET_AS = @echo ' ' AS ' ' $@; QUIET_NASM = @echo ' ' NASM ' ' $@; @@ -94,6 +95,9 @@ ifdef CXX_UPDATE_DEP_FLAG # Build rule for C++ files. Makes use of CXX_UPDATE_DEP_FLAG for advanced # dependency tracking. +%.o: %.c + $(QUIET)$(MKDIR) $(*D)/$(DEPDIR) + $(QUIET_CC)$(CC) $(CXX_UPDATE_DEP_FLAG) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o %.o: %.cpp $(QUIET)$(MKDIR) $(*D)/$(DEPDIR) $(QUIET_CXX)$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o |