[Scummvm-git-logs] scummvm master -> 7557f17ed28c7be07be470e65a051858d3b56c0e

[sev-]

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

Summary:
7557f17ed2 BUILD: Fix broken Dreamcast ronin handling & feature detection


Commit: 7557f17ed28c7be07be470e65a051858d3b56c0e
    https://github.com/scummvm/scummvm/commit/7557f17ed28c7be07be470e65a051858d3b56c0e
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-08-18T13:32:14+02:00

Commit Message:
BUILD: Fix broken Dreamcast ronin handling & feature detection

$(ronindir) and the explicit crt0 may have happened to work because
library detection state for libmad was forced, but it was always
breaking the feature detection of the build system. Now we can
compile to Dreamcast using the normal detection system.

Changed paths:
    backends/platform/dc/dreamcast.mk
    configure


diff --git a/backends/platform/dc/dreamcast.mk b/backends/platform/dc/dreamcast.mk
index 98b5bae..4d944c4 100644
--- a/backends/platform/dc/dreamcast.mk
+++ b/backends/platform/dc/dreamcast.mk
@@ -1,6 +1,4 @@
 
-ronindir = /usr/local/ronin
-
 CC := $(CXX)
 ASFLAGS := $(CXXFLAGS)
 
diff --git a/configure b/configure
index 723ebe9..ac3331c 100755
--- a/configure
+++ b/configure
@@ -1774,6 +1774,12 @@ android)
 		exit 1
 	fi
 	;;
+dreamcast)
+	if test -z "$RONINDIR"; then
+		echo "Please set RONINDIR in your environment. export RONINDIR=<path to libronin>"
+		exit 1
+	fi
+	;;
 n64)
 	if test -z "$N64SDK"; then
 		echo "Please set N64SDK in your environment. export N64SDK=<path to n64 sdk>"
@@ -3032,13 +3038,6 @@ if test -n "$_host"; then
 			append_var CXXFLAGS "-fdelete-null-pointer-checks"
 			_backend="dc"
 			_build_scalers=no
-			_mad=yes
-			_zlib=yes
-			if test -z "$RONINDIR"; then
-				add_line_to_config_mk "ronindir := /usr/local/ronin"
-			else
-				add_line_to_config_mk "ronindir := $RONINDIR"
-			fi
 			_port_mk="backends/platform/dc/dreamcast.mk"
 			;;
 		ds)
@@ -3409,11 +3408,9 @@ case $_backend in
 		;;
 	dc)
 		append_var INCLUDES '-I$(srcdir)/backends/platform/dc'
-		append_var INCLUDES '-isystem $(ronindir)/include'
 		append_var LDFLAGS "-Wl,-Ttext,0x8c010000"
 		append_var LDFLAGS "-nostartfiles"
-		append_var LDFLAGS '$(ronindir)/lib/crt0.o'
-		append_var LDFLAGS '-L$(ronindir)/lib'
+		append_var LIBS "$RONINDIR/lib/crt0.o"
 		# Enable serial debugging output only when --enable-debug is passed
 		if test "$_release_build" = yes -o "$_debug_build" != yes; then
 			append_var LIBS "-lronin-noserial -lm"