aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2011-05-05 20:24:57 +0200
committerJohannes Schickel2011-05-05 20:24:57 +0200
commit09b9e3ab9d6a914129e82d8dd97891041bc8e37b (patch)
treea161850a72aaa5cce7024bdf31ed3f3d589c436e
parent297834017a56140d1a33a4ce642bc9f39f54cf28 (diff)
downloadscummvm-rg350-09b9e3ab9d6a914129e82d8dd97891041bc8e37b.tar.gz
scummvm-rg350-09b9e3ab9d6a914129e82d8dd97891041bc8e37b.tar.bz2
scummvm-rg350-09b9e3ab9d6a914129e82d8dd97891041bc8e37b.zip
BUILD: Silence windres command line when a non-verbose build is done.
-rw-r--r--Makefile.common17
-rw-r--r--ports.mk2
2 files changed, 10 insertions, 9 deletions
diff --git a/Makefile.common b/Makefile.common
index e96774fe4e..8aee2b6d6e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -63,14 +63,15 @@ endif
ifneq ($(findstring $(MAKEFLAGS),s),s)
ifneq ($(VERBOSE_BUILD),1)
ifneq ($(VERBOSE_BUILD),yes)
-QUIET_CXX = @echo ' ' C++ ' ' $@;
-QUIET_AS = @echo ' ' AS ' ' $@;
-QUIET_NASM = @echo ' ' NASM ' ' $@;
-QUIET_AR = @echo ' ' AR ' ' $@;
-QUIET_RANLIB = @echo ' ' RANLIB ' ' $@;
-QUIET_PLUGIN = @echo ' ' PLUGIN ' ' $@;
-QUIET_LINK = @echo ' ' LINK ' ' $@;
-QUIET = @
+QUIET_CXX = @echo ' ' C++ ' ' $@;
+QUIET_AS = @echo ' ' AS ' ' $@;
+QUIET_NASM = @echo ' ' NASM ' ' $@;
+QUIET_AR = @echo ' ' AR ' ' $@;
+QUIET_RANLIB = @echo ' ' RANLIB ' ' $@;
+QUIET_PLUGIN = @echo ' ' PLUGIN ' ' $@;
+QUIET_LINK = @echo ' ' LINK ' ' $@;
+QUIET_WINDRES = @echo ' ' WINDRES '' $@;
+QUIET = @
endif
endif
endif
diff --git a/ports.mk b/ports.mk
index 512fec0507..78704fb680 100644
--- a/ports.mk
+++ b/ports.mk
@@ -162,7 +162,7 @@ osxsnap: bundle
#
scummvmwinres.o: $(srcdir)/icons/scummvm.ico $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(srcdir)/dists/scummvm.rc
- $(WINDRES) -DHAVE_CONFIG_H $(WINDRESFLAGS) $(DEFINES) -I. -I$(srcdir) $(srcdir)/dists/scummvm.rc scummvmwinres.o
+ $(QUIET_WINDRES)$(WINDRES) -DHAVE_CONFIG_H $(WINDRESFLAGS) $(DEFINES) -I. -I$(srcdir) $(srcdir)/dists/scummvm.rc scummvmwinres.o
# Special target to create a win32 snapshot binary
win32dist: $(EXECUTABLE)