[Scummvm-git-logs] scummvm branch-2-2 -> 4aa192ca7b8d5b5c55331f30f56b237601eedc0b

[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:
276fe768f3 AMIGAOS: Indented comments are now supported
4aa192ca7b AMIGAOS: Set optimization on non-debug-builds and ordering


Commit: 276fe768f373032db938461316525c277f9209e7
    https://github.com/scummvm/scummvm/commit/276fe768f373032db938461316525c277f9209e7
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2020-09-18T01:22:26+02:00

Commit Message:
AMIGAOS: Indented comments are now supported

Since when i don´t really know, might be for some time. I just tried with the scummvm-tools .mk and they work as intended.
Hope i don´t break anything else

Changed paths:
    backends/platform/sdl/amigaos/amigaos.mk


diff --git a/backends/platform/sdl/amigaos/amigaos.mk b/backends/platform/sdl/amigaos/amigaos.mk
index 1fe85615b2..bd0e15d2fa 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -1,5 +1,4 @@
 # Special target to create an AmigaOS snapshot installation.
-# AmigaOS shell doesn't like indented comments.
 amigaosdist: $(EXECUTABLE) $(PLUGINS)
 	mkdir -p $(AMIGAOSPATH)
 	mkdir -p $(AMIGAOSPATH)/extras
@@ -9,17 +8,17 @@ ifdef DIST_FILES_DOCS
 	mkdir -p $(AMIGAOSPATH)/doc
 	cp -r $(srcdir)/doc/ $(AMIGAOSPATH)
 	cp $(DIST_FILES_DOCS) $(AMIGAOSPATH)/doc/
-# Prepare README.md for AmigaGuide conversion.
+	# Prepare README.md for AmigaGuide conversion.
 	cat ${srcdir}/README.md | sed -f ${srcdir}/dists/amiga/convertRM.sed > README.conv
-# AmigaOS AREXX has a problem when ${srcdir} is '.'.
-# It will break with a "Program not found" error.
-# Copy the script to cwd and, once it has finished, remove it.
+	# AmigaOS AREXX has a problem when ${srcdir} is '.'.
+	# It will break with a "Program not found" error.
+	# Copy the script to cwd and, once it has finished, remove it.
 	cp ${srcdir}/dists/amiga/RM2AG.rexx .
 	rx RM2AG.rexx README.conv $(AMIGAOSPATH)/doc/
 	rm README.conv
 	rm RM2AG.rexx
 endif
-# Copy mandatory installation files.
+	# Copy mandatory installation files.
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(AMIGAOSPATH)/extras/
 endif
@@ -33,13 +32,13 @@ ifdef DIST_FILES_THEMES
 	mkdir -p $(AMIGAOSPATH)/themes
 	cp $(DIST_FILES_THEMES) $(AMIGAOSPATH)/themes/
 endif
-# Strip and copy engine plugins.
+	# Strip and copy engine plugins.
 ifdef DYNAMIC_MODULES
 	mkdir -p $(AMIGAOSPATH)/plugins
 	$(foreach plugin, $(PLUGINS), $(STRIP) $(plugin) -o $(AMIGAOSPATH)/$(plugin);)
-# Extract and install compiled-in shared libraries.
-# Not every AmigaOS installation, especially vanilla ones,
-# come with every mandatory shared library.
+	# Extract and install compiled-in shared libraries.
+	# Not every AmigaOS installation, especially vanilla ones,
+	# come with every mandatory shared library.
 	mkdir -p $(AMIGAOSPATH)/sobjs
 	cp ${srcdir}/dists/amiga/Ext_Inst_so.rexx .
 	rx Ext_Inst_so.rexx $(EXECUTABLE) $(AMIGAOSPATH)


Commit: 4aa192ca7b8d5b5c55331f30f56b237601eedc0b
    https://github.com/scummvm/scummvm/commit/4aa192ca7b8d5b5c55331f30f56b237601eedc0b
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2020-09-18T01:22:26+02:00

Commit Message:
AMIGAOS: Set optimization on non-debug-builds and ordering

Move morphos down the list to keep the alphabetic ordering

Changed paths:
    configure


diff --git a/configure b/configure
index 36a857e733..f189bc01fe 100755
--- a/configure
+++ b/configure
@@ -2637,6 +2637,9 @@ case $_host_os in
 		append_var LIBS "-lcitro3d"
 		;;
 	amigaos*)
+		if test "$_debug_build" = no; then
+			_optimization_level=-O2
+		fi
 		append_var LDFLAGS "-Wl,--export-dynamic"
 		append_var LDFLAGS "-L/sdk/local/newlib/lib"
 		# We have to use 'long' for our 4 byte typedef because AmigaOS already typedefs (u)int32
@@ -2648,24 +2651,6 @@ case $_host_os in
 		_port_mk="backends/platform/sdl/amigaos/amigaos.mk"
 		_nuked_opl=no
 		;;
-	morphos*)
-		if test "$_debug_build" = no; then
-			_optimization_level=-O2
-		fi
-		append_var LDFLAGS "-Wl,--export-dynamic"
-		append_var LDFLAGS "-L/usr/local/lib"
-		append_var CXXFLAGS "-D__MORPHOS_SHAREDLIBS"
-		# We have to use 'long' for our 4 byte typedef because MorphOS already typedefs (u)int32
-		# as (unsigned) long, and consequently we'd get a compiler error otherwise.
-		type_4_byte='long'
-		# Supress format warnings as the long 4 byte causes noisy warnings.
-		append_var CXXFLAGS "-Wno-format"
-		add_line_to_config_mk 'MORPHOS = 1'
-		_port_mk="backends/platform/sdl/morphos/morphos.mk"
-		# for use SDL2
-		_sdlconfig=sdl2-config
-		_nuked_opl=no
-		;;
 	android)
 		case $_host in
 			android-arm-v7a)
@@ -3007,6 +2992,24 @@ EOF
 		append_var DEFINES "-D_GNU_SOURCE"
 		append_var DEFINES "-D_ISOC11_SOURCE"
 		;;
+	morphos*)
+		if test "$_debug_build" = no; then
+			_optimization_level=-O2
+		fi
+		append_var LDFLAGS "-Wl,--export-dynamic"
+		append_var LDFLAGS "-L/usr/local/lib"
+		append_var CXXFLAGS "-D__MORPHOS_SHAREDLIBS"
+		# We have to use 'long' for our 4 byte typedef because MorphOS already typedefs (u)int32
+		# as (unsigned) long, and consequently we'd get a compiler error otherwise.
+		type_4_byte='long'
+		# Supress format warnings as the long 4 byte causes noisy warnings.
+		append_var CXXFLAGS "-Wno-format"
+		add_line_to_config_mk 'MORPHOS = 1'
+		_port_mk="backends/platform/sdl/morphos/morphos.mk"
+		# for use SDL2
+		_sdlconfig=sdl2-config
+		_nuked_opl=no
+		;;
 	msys)
 		echo ERROR: Using the MSYS shell in msys mode is not supported. Please use the MSYS shell in mingw mode instead.
 		exit 1