[Scummvm-git-logs] scummvm master -> 281c292d676322623352606d327f1d26673df32e

ccawley2011 ccawley2011 at gmail.com
Thu Sep 19 18:06:08 CEST 2019


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

Summary:
281c292d67 RISCOS: Minor build system improvements


Commit: 281c292d676322623352606d327f1d26673df32e
    https://github.com/scummvm/scummvm/commit/281c292d676322623352606d327f1d26673df32e
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-09-19T17:03:09+01:00

Commit Message:
RISCOS: Minor build system improvements

Changed paths:
    backends/fs/riscos/riscos-fs-factory.cpp
    backends/fs/riscos/riscos-fs.cpp
    configure


diff --git a/backends/fs/riscos/riscos-fs-factory.cpp b/backends/fs/riscos/riscos-fs-factory.cpp
index b698bcb..7069ea9 100644
--- a/backends/fs/riscos/riscos-fs-factory.cpp
+++ b/backends/fs/riscos/riscos-fs-factory.cpp
@@ -20,11 +20,13 @@
  *
  */
 
-#if defined(RISCOS)
-
 // Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h.
 #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
 
+#include "common/scummsys.h"
+
+#if defined(RISCOS)
+
 #include "backends/fs/riscos/riscos-fs-factory.h"
 #include "backends/fs/riscos/riscos-fs.h"
 
diff --git a/backends/fs/riscos/riscos-fs.cpp b/backends/fs/riscos/riscos-fs.cpp
index 810be2b..338e7cf 100644
--- a/backends/fs/riscos/riscos-fs.cpp
+++ b/backends/fs/riscos/riscos-fs.cpp
@@ -20,12 +20,14 @@
  *
  */
 
-#if defined(RISCOS)
-
 // Re-enable some forbidden symbols to avoid clashes with stat.h and unistd.h.
 #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h
 #define FORBIDDEN_SYMBOL_EXCEPTION_mkdir
 
+#include "common/scummsys.h"
+
+#if defined(RISCOS)
+
 #include "backends/platform/sdl/riscos/riscos-utils.h"
 #include "backends/fs/riscos/riscos-fs.h"
 #include "backends/fs/stdiostream.h"
diff --git a/configure b/configure
index 84a588c..370e181 100755
--- a/configure
+++ b/configure
@@ -2918,10 +2918,9 @@ case $_host_os in
 		add_line_to_config_mk 'PSP = 1'
 		;;
 	riscos)
-		append_var DEFINES "-DRISCOS"
-		add_line_to_config_mk 'RISCOS = 1'
+		define_in_config_if_yes yes 'RISCOS'
 		append_var LDFLAGS "-L$GCCSDK_INSTALL_ENV/lib"
-		append_var CXXFLAGS "-I$GCCSDK_INSTALL_ENV/include"
+		append_var CXXFLAGS "-isystem $GCCSDK_INSTALL_ENV/include"
 		_pkgconfig=$GCCSDK_INSTALL_ENV/ro-pkg-config
 		_sdlpath=$GCCSDK_INSTALL_ENV/bin
 		_freetypepath=$GCCSDK_INSTALL_ENV/bin
@@ -3061,7 +3060,7 @@ if test -n "$_host"; then
 			;;
 		arm-*riscos)
 			_opengl_mode=none
-			_build_hq_scalers=no
+			_vorbis=no
 			;;
 		bfin*)
 			;;





More information about the Scummvm-git-logs mailing list