aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCameron Cawley2017-12-23 16:56:40 +0000
committerDavid Turner2018-01-26 13:18:18 +0000
commit8f8eb81b1b5a558708cb2ff91410114579deefb6 (patch)
tree255e0832265b0aba6d51b184ebfef65ccf1c043a
parente4ab945b41796912f11b3b51eea8bc9f27dff6ae (diff)
downloadscummvm-rg350-8f8eb81b1b5a558708cb2ff91410114579deefb6.tar.gz
scummvm-rg350-8f8eb81b1b5a558708cb2ff91410114579deefb6.tar.bz2
scummvm-rg350-8f8eb81b1b5a558708cb2ff91410114579deefb6.zip
RISCOS: Don't list RISC OS as a POSIX platform
-rw-r--r--backends/platform/sdl/posix/posix-main.cpp2
-rwxr-xr-xconfigure6
2 files changed, 3 insertions, 5 deletions
diff --git a/backends/platform/sdl/posix/posix-main.cpp b/backends/platform/sdl/posix/posix-main.cpp
index e378c37849..92354b273e 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 ccb786233e..bd001c9c01 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*)