[Scummvm-git-logs] scummvm branch-2-2 -> ce2d81065ab99040aeb5c50f0e493729abfc7ce5

[ccawley2011]

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:
458c107331 RISCOS: Improve compilation flags
ce2d81065a CONFIGURE: Improve reporting the SDL version


Commit: 458c107331dedb21468dd36f2f1e98df18bbe47c
    https://github.com/scummvm/scummvm/commit/458c107331dedb21468dd36f2f1e98df18bbe47c
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-09-08T23:10:06+01:00

Commit Message:
RISCOS: Improve compilation flags

Changed paths:
    configure


diff --git a/configure b/configure
index 854a6eadca..1bac65ff08 100755
--- a/configure
+++ b/configure
@@ -3091,9 +3091,6 @@ EOF
 		append_var CXXFLAGS "-mtune=xscale"
 		append_var LDFLAGS "-static"
 		_optimization_level=-O2
-		append_var CXXFLAGS "-ffunction-sections"
-		append_var CXXFLAGS "-fdata-sections"
-		append_var LDFLAGS "-Wl,--gc-sections"
 		_port_mk="backends/platform/sdl/riscos/riscos.mk"
 		_pandoc=yes
 		_sdlconfig=sdl-config
@@ -5748,10 +5745,10 @@ else
 fi
 
 #
-# Some last-minute backend specific stuff, executed
+# Some last-minute platform specific stuff, executed
 # after all of CXXFLAGS, LDFLAGS, LIBS etc. have been setup
 #
-case $_backend in
+case $_host_os in
 	3ds)
 		if test "$_freetype2" = yes -a "$_png" = yes; then
 			append_var LIBS "-lbz2"
@@ -5794,6 +5791,12 @@ case $_backend in
 		# than pick up anything unhygenic from the Android libs.
 		LIBS="-Wl,-Bstatic $static_libs -Wl,-Bdynamic -lgcc $system_libs -llog -landroid -lGLESv1_CM"
 		;;
+	riscos)
+		append_var CXXFLAGS "-mno-poke-function-name"
+		append_var CXXFLAGS "-ffunction-sections"
+		append_var CXXFLAGS "-fdata-sections"
+		append_var LDFLAGS "-Wl,--gc-sections"
+		;;
 	n64)
 		# Move some libs down here, otherwise some symbols requires by libvorbis aren't found
 		# during linking stage


Commit: ce2d81065ab99040aeb5c50f0e493729abfc7ce5
    https://github.com/scummvm/scummvm/commit/ce2d81065ab99040aeb5c50f0e493729abfc7ce5
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-09-08T23:10:46+01:00

Commit Message:
CONFIGURE: Improve reporting the SDL version

Changed paths:
    configure


diff --git a/configure b/configure
index 1bac65ff08..b4abdbacf1 100755
--- a/configure
+++ b/configure
@@ -5687,7 +5687,11 @@ echo_n "Backend... "
 echo_n "$_backend"
 
 if test "$_sdl" = yes -a -n "$_sdlversion"; then
-	echo_n " ($_sdlversion)"
+	if test "$_backend" = sdl; then
+		echo_n " ($_sdlversion)"
+	else
+		echo_n " (SDL $_sdlversion)"
+	fi
 fi
 
 if test "$_nasm" = yes ; then