[Scummvm-git-logs] scummvm master -> 0fd6e4c2c9016f6e5aab2bcd95af163d852b3383

[ccawley2011]

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

Summary:
a46299ec37 RISCOS: Ignore non-convertible UTF-8 characters when converting the documentation
0fd6e4c2c9 RISCOS: Don't try to load the required modules if they aren't installed


Commit: a46299ec374a3cad646712e9e43185092a91e0ac
    https://github.com/scummvm/scummvm/commit/a46299ec374a3cad646712e9e43185092a91e0ac
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-09-18T17:14:10+01:00

Commit Message:
RISCOS: Ignore non-convertible UTF-8 characters when converting the documentation

Changed paths:
    backends/platform/sdl/riscos/riscos.mk


diff --git a/backends/platform/sdl/riscos/riscos.mk b/backends/platform/sdl/riscos/riscos.mk
index f208630..18fa80a 100644
--- a/backends/platform/sdl/riscos/riscos.mk
+++ b/backends/platform/sdl/riscos/riscos.mk
@@ -1,7 +1,7 @@
-ifeq ($(shell echo a | iconv --to-code=RISCOS-LATIN1//TRANSLIT >/dev/null 2>&1; echo $$?),0)
-ENCODING=RISCOS-LATIN1//TRANSLIT
+ifeq ($(shell echo a | iconv --to-code=RISCOS-LATIN1//IGNORE//TRANSLIT >/dev/null 2>&1; echo $$?),0)
+ENCODING=RISCOS-LATIN1//IGNORE//TRANSLIT
 else
-ENCODING=ISO-8859-1//TRANSLIT
+ENCODING=ISO-8859-1//IGNORE//TRANSLIT
 endif
 
 APP_NAME=!ScummVM


Commit: 0fd6e4c2c9016f6e5aab2bcd95af163d852b3383
    https://github.com/scummvm/scummvm/commit/0fd6e4c2c9016f6e5aab2bcd95af163d852b3383
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-09-18T17:14:10+01:00

Commit Message:
RISCOS: Don't try to load the required modules if they aren't installed

Changed paths:
    dists/riscos/!Run,feb


diff --git a/dists/riscos/!Run,feb b/dists/riscos/!Run,feb
index 8def7f7..531d94b 100644
--- a/dists/riscos/!Run,feb
+++ b/dists/riscos/!Run,feb
@@ -1,11 +1,15 @@
 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 ScummVM 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 RMLoadIfThere System:Modules.DRenderer
 RMEnsure DigitalRenderer 0.56 Error ScummVM requires DigitalRenderer 0.56 or later. This can be downloaded from https://www.riscos.info/packages/LibraryDetails.html#DRenderer
 
+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 "<ScummVM$Dir> --help" still work as expected.
 Set Alias$Run_ScummVM Run <ScummVM$Dir>.scummvm %%*0 ><Choices$Write>.ScummVM.stdout 2><Choices$Write>.ScummVM.stderr