[Scummvm-git-logs] scummvm master -> edb55a09821c29ed5a3f0029a212be6b5856db67

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c271694143 JANITORIAL: Remove trailing spaces
edb55a0982 BUILD: Show file sizes in verbose build


Commit: c2716941433bc824ed4a035d7da54917bafb1ba4
    https://github.com/scummvm/scummvm/commit/c2716941433bc824ed4a035d7da54917bafb1ba4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-07-03T14:28:53+02:00

Commit Message:
JANITORIAL: Remove trailing spaces

Changed paths:
    configure


diff --git a/configure b/configure
index 5c232974100..175aa50c7c1 100755
--- a/configure
+++ b/configure
@@ -2877,12 +2877,12 @@ EOF
 	emscripten)
 		# mandatory emscripten flags
 		append_var LDFLAGS "-s ALLOW_MEMORY_GROWTH=1 -s ASYNCIFY -s FORCE_FILESYSTEM=1"
-	
+
 		append_var DEFINES "-DEMSCRIPTEN"
 		add_line_to_config_mk 'EMSCRIPTEN = 1'
 
 		if test "$_debug_build" = yes; then
-			_optimization_level=-O2 
+			_optimization_level=-O2
 			append_var LDFLAGS "-O2 -g3 -s ASSERTIONS=2"
 		else
 			_optimization_level=-O3
@@ -2896,13 +2896,13 @@ EOF
 			_freetypepath="$EMSCRIPTEN/cache/ports-builds/freetype/"
 			FREETYPE2_CFLAGS="-I$_freetypepath/include" # there were link errors / missing symbols without this
 			_freetype_found="true"
-		else 
+		else
 			#use link time optimization to further reduce exe size (this can't be used with setjmp whcih freetype requires)
 			# TODO: Figure out why this is a conflict and/or if freetype can be built without setjmp
 			append_var CXXFLAGS "-flto"
 			append_var LDFLAGS "-flto"
 		fi
-		if test "$_jpeg" != no; then 
+		if test "$_jpeg" != no; then
 			append_var LDFLAGS "-s USE_LIBJPEG=1"
 		fi
 		if test "$_png" != no; then
@@ -2910,8 +2910,8 @@ EOF
 		fi
 		if test "$_sdl" != no; then
 			append_var LDFLAGS "-s USE_SDL=2 "
-		fi 
-		if test "$_vorbis" != no; then 
+		fi
+		if test "$_vorbis" != no; then
 			append_var LDFLAGS "-s USE_OGG=1" # vorbis needs to be linked against OGG (even if we use an external vorbis lib)
 		fi
 		if test "$_zlib" != no; then


Commit: edb55a09821c29ed5a3f0029a212be6b5856db67
    https://github.com/scummvm/scummvm/commit/edb55a09821c29ed5a3f0029a212be6b5856db67
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-07-03T14:28:53+02:00

Commit Message:
BUILD: Show file sizes in verbose build

Changed paths:
    Makefile
    Makefile.common
    rules.mk


diff --git a/Makefile b/Makefile
index a6d83e7d3e8..60056c87ee0 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,12 @@ RM      ?= rm -f
 RM_REC  ?= $(RM) -r
 ZIP     ?= zip -q
 
+ifeq ($(VERBOSE_BUILD),1)
+	LS := ls -l
+else
+	LS := true
+endif
+
 #######################################################################
 # Misc stuff - you should never have to edit this                     #
 #######################################################################
diff --git a/Makefile.common b/Makefile.common
index bc0be7bc55e..ab4cfd8c270 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -125,6 +125,7 @@ endif
 # The build rule for the ScummVM executable
 $(EXECUTABLE): $(DETECT_OBJS) $(OBJS)
 	+$(QUIET_LINK)$(LD) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
+	+$(QUIET)$(LS) $@
 
 ifdef SPLIT_DWARF
 $(EXECUTABLE).dwp: $(EXECUTABLE)
diff --git a/rules.mk b/rules.mk
index 7081489f8c9..b12999377de 100644
--- a/rules.mk
+++ b/rules.mk
@@ -84,6 +84,7 @@ $(MODULE_LIB-$(MODULE)): $(MODULE_OBJS-$(MODULE))
 	$(QUIET)-$(RM) $@
 	$(QUIET_AR)$(AR) $@ $+
 	$(QUIET_RANLIB)$(RANLIB) $@
+	$(QUIET)$(LS) $@
 
 # Pseudo target for comfort, allows for "make common", "make gui" etc.
 $(MODULE): $(MODULE_LIB-$(MODULE))