[Scummvm-git-logs] scummvm master -> a591c8b6bf1a68604500fa3425d7b423a2bfb455

[lephilousophe]

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:
b065158898 RISCOS: Don't build SDLPluginProvider: it doesn't work for us
a591c8b6bf RISCOS: Add expf to functions to link


Commit: b065158898c07fada440c157a42b34aeedfabd31
    https://github.com/scummvm/scummvm/commit/b065158898c07fada440c157a42b34aeedfabd31
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-06-18T16:10:22+02:00

Commit Message:
RISCOS: Don't build SDLPluginProvider: it doesn't work for us

And it fails to build with VFP because libdl is not compiled with VFP

Changed paths:
    backends/plugins/sdl/sdl-provider.cpp


diff --git a/backends/plugins/sdl/sdl-provider.cpp b/backends/plugins/sdl/sdl-provider.cpp
index 2bce01e0867..7793a8b8f5b 100644
--- a/backends/plugins/sdl/sdl-provider.cpp
+++ b/backends/plugins/sdl/sdl-provider.cpp
@@ -21,7 +21,8 @@
 
 #include "common/scummsys.h"
 
-#if defined(DYNAMIC_MODULES) && defined(SDL_BACKEND)
+// RiscOS uses its own plugin provider and SDL one doesn't work
+#if defined(DYNAMIC_MODULES) && defined(SDL_BACKEND) && !defined(RISCOS)
 
 #include "backends/plugins/sdl/sdl-provider.h"
 #include "backends/plugins/dynamic-plugin.h"


Commit: a591c8b6bf1a68604500fa3425d7b423a2bfb455
    https://github.com/scummvm/scummvm/commit/a591c8b6bf1a68604500fa3425d7b423a2bfb455
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-06-18T16:10:22+02:00

Commit Message:
RISCOS: Add expf to functions to link

Changed paths:
    backends/plugins/riscos/riscos-provider.cpp


diff --git a/backends/plugins/riscos/riscos-provider.cpp b/backends/plugins/riscos/riscos-provider.cpp
index 0e2d5de61a2..6399c030c29 100644
--- a/backends/plugins/riscos/riscos-provider.cpp
+++ b/backends/plugins/riscos/riscos-provider.cpp
@@ -43,6 +43,7 @@ void pluginHack() {
 	f = tanhf(f);
 	f = logf(f);
 	f = lroundf(f);
+	f = expf(f);
 	f = frexpf(f, NULL);
 	f = ldexpf(f, 1);
 	f = fmaxf(f, f);