[Scummvm-git-logs] scummvm branch-2-6 -> b7db838039ea0ee8100a8859aa42f75de30e2754

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


Commit: abab65fa6ad2179ed704cc70efcdbefa84c9399d
    https://github.com/scummvm/scummvm/commit/abab65fa6ad2179ed704cc70efcdbefa84c9399d
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-06-18T16:11:06+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: b7db838039ea0ee8100a8859aa42f75de30e2754
    https://github.com/scummvm/scummvm/commit/b7db838039ea0ee8100a8859aa42f75de30e2754
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-06-18T16:11:06+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);