[Scummvm-git-logs] scummvm master -> f7b467275a88dacb8ebd8e8ef6c85b8d7715caa7
digitall
dgturner at iee.org
Fri Jan 26 14:18:22 CET 2018
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:
8f8eb81b1b RISCOS: Don't list RISC OS as a POSIX platform
f7b467275a RISCOS: Fix compilation of null backend
Commit: 8f8eb81b1b5a558708cb2ff91410114579deefb6
https://github.com/scummvm/scummvm/commit/8f8eb81b1b5a558708cb2ff91410114579deefb6
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-01-26T13:18:18Z
Commit Message:
RISCOS: Don't list RISC OS as a POSIX platform
Changed paths:
backends/platform/sdl/posix/posix-main.cpp
configure
diff --git a/backends/platform/sdl/posix/posix-main.cpp b/backends/platform/sdl/posix/posix-main.cpp
index e378c37..92354b2 100644
--- a/backends/platform/sdl/posix/posix-main.cpp
+++ b/backends/platform/sdl/posix/posix-main.cpp
@@ -22,7 +22,7 @@
#include "common/scummsys.h"
-#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) && !defined(PSP2) && !defined(ANDROIDSDL) && !defined(RISCOS)
+#if defined(POSIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(MAEMO) && !defined(WEBOS) && !defined(LINUXMOTO) && !defined(GPH_DEVICE) && !defined(GP2X) && !defined(DINGUX) && !defined(OPENPANDORA) && !defined(PLAYSTATION3) && !defined(PSP2) && !defined(ANDROIDSDL)
#include "backends/platform/sdl/posix/posix.h"
#include "backends/plugins/sdl/sdl-provider.h"
diff --git a/configure b/configure
index ccb7862..bd001c9 100755
--- a/configure
+++ b/configure
@@ -2839,8 +2839,6 @@ if test -n "$_host"; then
arm-linux|arm*-linux-gnueabi|arm-*-linux)
;;
arm-*riscos)
- _seq_midi=no
- _timidity=no
_opengl_mode=none
_build_hq_scalers=no
# toolchain binaries prefixed by host
@@ -3601,10 +3599,10 @@ esac
#
echo_n "Checking if host is POSIX compliant... "
case $_host_os in
- amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp2 | psp | wii | wince)
+ amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp2 | psp | riscos | wii | wince)
_posix=no
;;
- 3ds | android | androidsdl | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | riscos | solaris* | sunos* | uclinux* | webos)
+ 3ds | android | androidsdl | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | solaris* | sunos* | uclinux* | webos)
_posix=yes
;;
os2-emx*)
Commit: f7b467275a88dacb8ebd8e8ef6c85b8d7715caa7
https://github.com/scummvm/scummvm/commit/f7b467275a88dacb8ebd8e8ef6c85b8d7715caa7
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-01-26T13:18:18Z
Commit Message:
RISCOS: Fix compilation of null backend
Changed paths:
backends/platform/null/null.cpp
diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index a5eea06..be50fde 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -47,6 +47,8 @@
#include "backends/fs/amigaos4/amigaos4-fs-factory.h"
#elif defined(POSIX)
#include "backends/fs/posix/posix-fs-factory.h"
+#elif defined(RISCOS)
+ #include "backends/fs/riscos/riscos-fs-factory.h"
#elif defined(WIN32)
#include "backends/fs/windows/windows-fs-factory.h"
#endif
@@ -73,6 +75,8 @@ OSystem_NULL::OSystem_NULL() {
_fsFactory = new AmigaOSFilesystemFactory();
#elif defined(POSIX)
_fsFactory = new POSIXFilesystemFactory();
+ #elif defined(RISCOS)
+ _fsFactory = new RISCOSFilesystemFactory();
#elif defined(WIN32)
_fsFactory = new WindowsFilesystemFactory();
#else
More information about the Scummvm-git-logs
mailing list