diff options
| author | Colin Snover | 2017-11-06 00:03:30 -0600 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-18 13:32:14 +0200 |
| commit | 7557f17ed28c7be07be470e65a051858d3b56c0e (patch) | |
| tree | 873967a682768ad9ab0144fc1db77f81ff08d8f9 | |
| parent | 9df74693ba9fd074b6090e04ed8ec76d99c77aa0 (diff) | |
| download | scummvm-rg350-7557f17ed28c7be07be470e65a051858d3b56c0e.tar.gz scummvm-rg350-7557f17ed28c7be07be470e65a051858d3b56c0e.tar.bz2 scummvm-rg350-7557f17ed28c7be07be470e65a051858d3b56c0e.zip | |
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.
| -rw-r--r-- | backends/platform/dc/dreamcast.mk | 2 | ||||
| -rwxr-xr-x | configure | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/backends/platform/dc/dreamcast.mk b/backends/platform/dc/dreamcast.mk index 98b5bae087..4d944c4a51 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) @@ -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" |