aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcraigsc2020-01-12 19:13:48 -0800
committercraigsc2020-01-12 19:13:48 -0800
commitc0c74116b6d3d3b47fbdae05eec4ffa6e9d07222 (patch)
treebcb0d8fec122a0d729fd7b6d93a88e0143268858
parente7821ad6529716f4add513754c0ed9c5357ff223 (diff)
downloadscummvm-rg350-c0c74116b6d3d3b47fbdae05eec4ffa6e9d07222.tar.gz
scummvm-rg350-c0c74116b6d3d3b47fbdae05eec4ffa6e9d07222.tar.bz2
scummvm-rg350-c0c74116b6d3d3b47fbdae05eec4ffa6e9d07222.zip
Compile the GCW0 target with libmad, and dynamically link the lib
at runtime since the standard RG350 OS does not include it. This repairs music playback on all games that rely on .mp3 playback (of note, the CD-ROM version of Monkey Island 1)
-rwxr-xr-xbackends/platform/dingux/build.gcw0.sh2
-rw-r--r--backends/platform/dingux/dingux.mk4
2 files changed, 5 insertions, 1 deletions
diff --git a/backends/platform/dingux/build.gcw0.sh b/backends/platform/dingux/build.gcw0.sh
index 7a31d4fd27..c78c5327bf 100755
--- a/backends/platform/dingux/build.gcw0.sh
+++ b/backends/platform/dingux/build.gcw0.sh
@@ -3,4 +3,4 @@
export PATH=/opt/gcw0-toolchain/usr/bin:$PATH
# Disable high resolution engines since we have 320x240 hardware
-./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release && make -j6 gcw-opk && ls -l scummvm.opk
+./configure --host=gcw0 --with-mad-prefix=/opt/gcw0-toolchain/usr --enable-plugins --default-dynamic --enable-release && make -j6 gcw-opk && ls -l scummvm.opk
diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk
index 7957346325..816b6fb6d4 100644
--- a/backends/platform/dingux/dingux.mk
+++ b/backends/platform/dingux/dingux.mk
@@ -2,6 +2,8 @@ DINGUX_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
bundle_name = dingux-dist/scummvm
gcw0_bundle = gcw0-opk
+f=$(shell which $(STRIP))
+libloc = $(shell dirname $(f))
all: $(DINGUX_EXE_STRIPPED)
@@ -32,6 +34,7 @@ ifdef DYNAMIC_MODULES
$(CP) $(PLUGINS) $(bundle_name)/plugins
$(STRIP) $(bundle_name)/plugins/*
endif
+
$(CP) $(srcdir)/backends/platform/dingux/scummvm.gpe $(bundle_name)/
$(CP) $(srcdir)/backends/platform/dingux/README.DINGUX $(bundle_name)/
$(CP) $(srcdir)/backends/platform/dingux/scummvm.png $(bundle_name)/
@@ -56,6 +59,7 @@ ifdef DYNAMIC_MODULES
$(MKDIR) $(gcw0_bundle)/plugins
$(CP) $(PLUGINS) $(gcw0_bundle)/plugins/
endif
+ $(CP) $(libloc)/../lib/libmad.so.0.2.1 $(gcw0_bundle)/libmad.so.0
$(CP) $(EXECUTABLE) $(gcw0_bundle)/scummvm
$(CP) $(srcdir)/dists/gcw0/scummvm.png $(gcw0_bundle)/