aboutsummaryrefslogtreecommitdiff
path: root/Makefile.common
diff options
context:
space:
mode:
authorEugene Sandulenko2014-04-28 21:20:42 +0300
committerEugene Sandulenko2014-04-28 21:20:42 +0300
commitc3ffbd884a2d917aede6020c4ae1ee4a13d7f861 (patch)
treeeef69449accc9a020cf1be49703a0dd698340c11 /Makefile.common
parent3d5dee897ef785e3f0c48ae3d857181f314700d1 (diff)
parent4592e0b586829fade4a5c800672849e693a0d151 (diff)
downloadscummvm-rg350-c3ffbd884a2d917aede6020c4ae1ee4a13d7f861.tar.gz
scummvm-rg350-c3ffbd884a2d917aede6020c4ae1ee4a13d7f861.tar.bz2
scummvm-rg350-c3ffbd884a2d917aede6020c4ae1ee4a13d7f861.zip
Merge pull request #426 from sunmax/master
PS2: Pull request to master for latest PS2 code
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.common b/Makefile.common
index 4071d97150..993b833f4e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -62,6 +62,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 ' ' $@;
@@ -95,6 +96,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