[Scummvm-git-logs] scummvm branch-2-6 -> 93b538026b585e7fd6c0b77bd2191f9a772946aa

[sev-]

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

Summary:
214c267272 AMIGAOS: Add DEBUG_BUILD define to configure
06004dab53 AMIGAOS: Make use of DEBUG_BUILD define
93b538026b AMIGAOS: Corrected plugins destination path


Commit: 214c2672725b649d451fc42e75275c924af74f50
    https://github.com/scummvm/scummvm/commit/214c2672725b649d451fc42e75275c924af74f50
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-06-22T01:41:56+02:00

Commit Message:
AMIGAOS: Add DEBUG_BUILD define to configure

Changed paths:
    configure


diff --git a/configure b/configure
index 44e891c15c5..ee1c5c2088c 100755
--- a/configure
+++ b/configure
@@ -2590,6 +2590,7 @@ case $_host_os in
 			_optimization_level=-O0
 			append_var CXXFLAGS "-fno-omit-frame-pointer"
 			append_var CXXFLAGS "-fno-strict-aliasing"
+			define_in_config_if_yes "$_debug_build" 'DEBUG_BUILD'
 		fi
 		# When building dynamic, add everything possible as plugin
 		if test "$_dynamic_modules" = yes ; then


Commit: 06004dab535ebd94bc6a4aed25b7ccc2d94fd1fc
    https://github.com/scummvm/scummvm/commit/06004dab535ebd94bc6a4aed25b7ccc2d94fd1fc
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-06-22T01:42:00+02:00

Commit Message:
AMIGAOS: Make use of DEBUG_BUILD define

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 5152711e984..a87f35def1e 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -48,7 +48,12 @@ ifneq ($(DIST_FILES_SHADERS),)
 endif
 ifdef DYNAMIC_MODULES
 	makedir all $(AMIGAOSPATH)/plugins
-	$(foreach plugin, $(PLUGINS), $(STRIP) $(plugin) -o $(AMIGAOSPATH)/$(plugin);)
+	# Preserve all debug information on debug builds
+ifdef DEBUG_BUILD
+		cp $(PLUGINS) $(AMIGAOSPATH)/$(plugin)
+else
+		$(foreach plugin, $(PLUGINS), $(STRIP) $(plugin) -o $(AMIGAOSPATH)/$(plugin);)
+endif
 	makedir all $(AMIGAOSPATH)/sobjs
 	# AmigaOS installations, especially vanilla ones, won't have every
 	# mandatory shared library in place, let alone the correct versions.
@@ -57,5 +62,9 @@ ifdef DYNAMIC_MODULES
 	rx Ext_Inst_so.rexx $(EXECUTABLE) $(AMIGAOSPATH)
 	rm -f Ext_Inst_so.rexx
 endif
+# Preserve all debug information on debug builds
+ifdef DEBUG_BUILD
+	cp $(EXECUTABLE) $(AMIGAOSPATH)/$(EXECUTABLE)
+else
 	$(STRIP) $(EXECUTABLE) -o $(AMIGAOSPATH)/$(EXECUTABLE)
-
+endif


Commit: 93b538026b585e7fd6c0b77bd2191f9a772946aa
    https://github.com/scummvm/scummvm/commit/93b538026b585e7fd6c0b77bd2191f9a772946aa
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2022-06-22T01:42:00+02:00

Commit Message:
AMIGAOS: Corrected plugins destination path

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 a87f35def1e..d4c569512bd 100644
--- a/backends/platform/sdl/amigaos/amigaos.mk
+++ b/backends/platform/sdl/amigaos/amigaos.mk
@@ -50,7 +50,7 @@ ifdef DYNAMIC_MODULES
 	makedir all $(AMIGAOSPATH)/plugins
 	# Preserve all debug information on debug builds
 ifdef DEBUG_BUILD
-		cp $(PLUGINS) $(AMIGAOSPATH)/$(plugin)
+		cp $(PLUGINS) $(AMIGAOSPATH)/plugins/$(plugin)
 else
 		$(foreach plugin, $(PLUGINS), $(STRIP) $(plugin) -o $(AMIGAOSPATH)/$(plugin);)
 endif