[Scummvm-cvs-logs] scummvm master -> 3bcc3a6849bcf27a35790581bb4476f9ed2a4355

digitall dgturner at iee.org
Sat Mar 22 02:10:51 CET 2014


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

Summary:
554a1abae1 CONFIGURE: Modify AmigaOS debug information format to plain stabs.
b7f8c11274 CONFIGURE: Fix AmigaOS4 builds with dynamic plugins.
22634d18ba AMIGAOS: Update CAMD midi to use output port environment variable.
3bcc3a6849 AMIGAOS: Minor change to replace strcpy usage with safer strlcpy.


Commit: 554a1abae12c465f18a1b0265c185d9d5a0f12b2
    https://github.com/scummvm/scummvm/commit/554a1abae12c465f18a1b0265c185d9d5a0f12b2
Author: raziel- (raziel- at users.noreply.github.com)
Date: 2014-03-22T01:13:45Z

Commit Message:
CONFIGURE: Modify AmigaOS debug information format to plain stabs.

As the GCC manual notes, "On most systems that use stabs format, -g
enables use of extra debugging information that only GDB can use;
this extra information makes debugging work better in GDB but will
probably make other debuggers crash or refuse to read the program."

-gstabs produces stabs without GDB extensions, and thus the AmigaOS
debugger will work.

Changed paths:
    configure



diff --git a/configure b/configure
index 74d1264..f964db3 100755
--- a/configure
+++ b/configure
@@ -1487,8 +1487,16 @@ caanoo | gp2x | gp2xwiz | openpandora | ps2)
 esac
 
 if test "$_debug_build" != no; then
-	# debug mode not explicitly disabled -> compile with -g
-	CXXFLAGS="$CXXFLAGS -g"
+	# debug mode not explicitly disabled -> compile with debug information
+	case $_host_os in
+	amigaos*)
+		# AmigaOS debugger uses plain stabs, with no gdb extensions.
+		CXXFLAGS="$CXXFLAGS -gstabs"
+	;;
+	*)
+		# Use the system default format for debug info.
+		CXXFLAGS="$CXXFLAGS -g"
+	esac
 fi
 
 if test "$_release_build" = yes; then


Commit: b7f8c11274ffafda63e5680ff489796e1cc86912
    https://github.com/scummvm/scummvm/commit/b7f8c11274ffafda63e5680ff489796e1cc86912
Author: raziel- (raziel- at users.noreply.github.com)
Date: 2014-03-22T01:13:45Z

Commit Message:
CONFIGURE: Fix AmigaOS4 builds with dynamic plugins.

These previously caused crashes due to missing symbols in the dynamic
symbol table.

Changed paths:
    configure



diff --git a/configure b/configure
index f964db3..caf88b3 100755
--- a/configure
+++ b/configure
@@ -2053,7 +2053,7 @@ echo_n "Checking hosttype... "
 echo $_host_os
 case $_host_os in
 	amigaos*)
-		LDFLAGS="$LDFLAGS -use-dynld"
+		LDFLAGS="$LDFLAGS -use-dynld -Wl,--export-dynamic"
 		LDFLAGS="$LDFLAGS -L/sdk/local/newlib/lib"
 		# We have to use 'long' for our 4 byte typedef because AmigaOS already typedefs (u)int32
 		# as (unsigned) long, and consequently we'd get a compiler error otherwise.


Commit: 22634d18ba5a4d831878df7b29f715a9318994e0
    https://github.com/scummvm/scummvm/commit/22634d18ba5a4d831878df7b29f715a9318994e0
Author: raziel- (raziel- at users.noreply.github.com)
Date: 2014-03-22T01:13:45Z

Commit Message:
AMIGAOS: Update CAMD midi to use output port environment variable.

If this is not present, it will use the default as previously.

Changed paths:
    backends/midi/camd.cpp



diff --git a/backends/midi/camd.cpp b/backends/midi/camd.cpp
index 2c57289..9cee2a8 100644
--- a/backends/midi/camd.cpp
+++ b/backends/midi/camd.cpp
@@ -36,6 +36,7 @@
 
 #include <proto/camd.h>
 #include <proto/exec.h>
+#include <proto/dos.h>
 
 /*
  * CAMD sequencer driver
@@ -56,6 +57,7 @@ private:
 	struct Library *_CamdBase;
 	struct CamdIFace *_ICamd;
 	struct MidiLink *_midi_link;
+	char _outport[128];
 
 	char *getDevice();
 	void closeAll();
@@ -155,13 +157,18 @@ char *MidiDriver_CAMD::getDevice() {
 
 			if (strstr(dev, "out") != NULL) {
 				// This is an output device, return this
-				retname = dev;
+				strcpy(_outport, dev);
+				retname = _outport;
 			} else {
 				// Search the next one
 				cluster = _ICamd->NextCluster(cluster);
 			}
 		}
 
+		// If the user has a preference outport set, use this instead
+		if(IDOS->GetVar("DefMidiOut", _outport, 128, 0))
+			retname = _outport;
+
 		_ICamd->UnlockCAMD(key);
 	}
 


Commit: 3bcc3a6849bcf27a35790581bb4476f9ed2a4355
    https://github.com/scummvm/scummvm/commit/3bcc3a6849bcf27a35790581bb4476f9ed2a4355
Author: D G Turner (digitall at scummvm.org)
Date: 2014-03-22T01:13:45Z

Commit Message:
AMIGAOS: Minor change to replace strcpy usage with safer strlcpy.

Changed paths:
    backends/midi/camd.cpp



diff --git a/backends/midi/camd.cpp b/backends/midi/camd.cpp
index 9cee2a8..d91aef5 100644
--- a/backends/midi/camd.cpp
+++ b/backends/midi/camd.cpp
@@ -31,6 +31,7 @@
 #include "common/error.h"
 #include "common/endian.h"
 #include "common/util.h"
+#include "common/str.h"
 #include "audio/musicplugin.h"
 #include "audio/mpu401.h"
 
@@ -157,7 +158,7 @@ char *MidiDriver_CAMD::getDevice() {
 
 			if (strstr(dev, "out") != NULL) {
 				// This is an output device, return this
-				strcpy(_outport, dev);
+				Common::strlcpy(_outport, dev, sizeof(_outport));
 				retname = _outport;
 			} else {
 				// Search the next one






More information about the Scummvm-git-logs mailing list