diff options
| author | Cameron Cawley | 2019-09-19 17:03:09 +0100 |
|---|---|---|
| committer | Cameron Cawley | 2019-09-19 17:03:09 +0100 |
| commit | 281c292d676322623352606d327f1d26673df32e (patch) | |
| tree | 8254382346f829ecc32be68603d0c87f0f1cfdf7 | |
| parent | b19de22053932f61d73e2cd6a17f429000ce7bc3 (diff) | |
| download | scummvm-rg350-281c292d676322623352606d327f1d26673df32e.tar.gz scummvm-rg350-281c292d676322623352606d327f1d26673df32e.tar.bz2 scummvm-rg350-281c292d676322623352606d327f1d26673df32e.zip | |
RISCOS: Minor build system improvements
| -rw-r--r-- | backends/fs/riscos/riscos-fs-factory.cpp | 6 | ||||
| -rw-r--r-- | backends/fs/riscos/riscos-fs.cpp | 6 | ||||
| -rwxr-xr-x | configure | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/backends/fs/riscos/riscos-fs-factory.cpp b/backends/fs/riscos/riscos-fs-factory.cpp index b698bcb908..7069ea92b8 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 810be2b417..338e7cfda5 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" @@ -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*) ;; |