From 9be3cc9b6bda05d4559df4d993214a67d34d75d3 Mon Sep 17 00:00:00 2001
From: Cameron Cawley <ccawley2011@gmail.com>
Date: Thu, 19 Mar 2020 22:43:24 +0000
Subject: [PATCH] RISCOS: Apply additional fixes from ScummVM

---
 dists/riscos/!Run,feb | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/dists/riscos/!Run,feb b/dists/riscos/!Run,feb
index eb388290c0b..8ecee210e97 100644
--- a/dists/riscos/!Run,feb
+++ b/dists/riscos/!Run,feb
@@ -1,13 +1,25 @@
 Run <Obey$Dir>.!Boot
 
-RMEnsure SharedUnixLibrary 1.14 RMLoad System:Modules.SharedULib
+Set Alias$RMLoadIfThere IfThere %%0 Then RMLoad %%*0
+
+RMEnsure SharedUnixLibrary 1.14 RMLoadIfThere System:Modules.SharedULib
 RMEnsure SharedUnixLibrary 1.14 Error ResidualVM requires SharedUnixLibrary 1.14 or later. This can be downloaded from https://www.riscos.info/packages/LibraryDetails.html#SharedUnixLibrary
 
-RMEnsure DigitalRenderer 0.56 RMLoad System:Modules.DRenderer
-RMEnsure DigitalRenderer 0.56 Error ResidualVM requires DigitalRenderer 0.56 or later. This can be downloaded from https://www.riscos.info/packages/LibraryDetails.html#DRenderer
+RMEnsure DigitalRenderer 0.55 RMLoadIfThere System:Modules.DRenderer
+RMEnsure DigitalRenderer 0.55 Error ResidualVM requires DigitalRenderer 0.55 or later. This can be downloaded from https://www.riscos.info/packages/LibraryDetails.html#DRenderer
 
-Set ResidualVM$stdout ><Choices$Write>.ResidualVM.stdout 2><Choices$Write>.ResidualVM.stderr
-If "<Wimp$State>"="commands" Then Unset ResidualVM$stdout Else CDir <Choices$Write>.ResidualVM
+RMEnsure Iconv 0.12 RMLoadIfThere System:Modules.Iconv
+RMEnsure Iconv 0.12 Error ResidualVM requires Iconv 0.12 or later. This can be downloaded from https://www.netsurf-browser.org/projects/iconv/
+
+Unset Alias$RMLoadIfThere
+
+| If running from the desktop, redirect stdout and stderr to a file.
+| This shouldn't happen when running from the command line, so that commands like "<ResidualVM$Dir> --help" still work as expected.
+Set Alias$Run_ResidualVM Run <ResidualVM$Dir>.residualvm %%*0 ><Choices$Write>.ResidualVM.stdout 2><Choices$Write>.ResidualVM.stderr
+If "<Wimp$State>"="commands" Then Set Alias$Run_ResidualVM Run <ResidualVM$Dir>.residualvm %%*0
+CDir <Choices$Write>.ResidualVM
 
 |WimpSlot
-Do Run <ResidualVM$Dir>.residualvm %*0 <ResidualVM$stdout>
+Run_ResidualVM %*0
+
+Unset Alias$Run_ResidualVM