diff options
| author | Cameron Cawley | 2018-08-15 22:59:45 +0100 |
|---|---|---|
| committer | David Turner | 2018-09-14 02:33:16 +0100 |
| commit | 174b0d18643a6fc14135157ec7c0e4e2deaeeb20 (patch) | |
| tree | 10c4e4e7230a7a9f68bb800066cd76591931b0dd | |
| parent | 58f3aac49ece050ddd3f5a51b4033a1bcadc08a7 (diff) | |
| download | scummvm-rg350-174b0d18643a6fc14135157ec7c0e4e2deaeeb20.tar.gz scummvm-rg350-174b0d18643a6fc14135157ec7c0e4e2deaeeb20.tar.bz2 scummvm-rg350-174b0d18643a6fc14135157ec7c0e4e2deaeeb20.zip | |
PS2: Fix compilation with latest PS2SDK
| -rw-r--r-- | backends/fs/ps2/ps2-fs.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/ps2/Gs2dScreen.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/ps2/fileio.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/ps2/ps2mutex.cpp | 3 | ||||
| -rw-r--r-- | backends/plugins/ps2/ps2-provider.cpp | 5 | ||||
| -rwxr-xr-x | configure | 8 |
6 files changed, 20 insertions, 2 deletions
diff --git a/backends/fs/ps2/ps2-fs.cpp b/backends/fs/ps2/ps2-fs.cpp index eba740e948..b6f184fbbf 100644 --- a/backends/fs/ps2/ps2-fs.cpp +++ b/backends/fs/ps2/ps2-fs.cpp @@ -25,6 +25,8 @@ // Disable symbol overrides so that we can use "FILE" #define FORBIDDEN_SYMBOL_EXCEPTION_FILE #define FORBIDDEN_SYMBOL_EXCEPTION_printf +#define FORBIDDEN_SYMBOL_EXCEPTION_abort +#define FORBIDDEN_SYMBOL_EXCEPTION_exit #include "backends/fs/ps2/ps2-fs.h" diff --git a/backends/platform/ps2/Gs2dScreen.cpp b/backends/platform/ps2/Gs2dScreen.cpp index 823defe8b4..a11d70162e 100644 --- a/backends/platform/ps2/Gs2dScreen.cpp +++ b/backends/platform/ps2/Gs2dScreen.cpp @@ -21,6 +21,8 @@ */ #define FORBIDDEN_SYMBOL_EXCEPTION_printf +#define FORBIDDEN_SYMBOL_EXCEPTION_abort +#define FORBIDDEN_SYMBOL_EXCEPTION_exit #include "Gs2dScreen.h" #include <kernel.h> diff --git a/backends/platform/ps2/fileio.cpp b/backends/platform/ps2/fileio.cpp index 205a688438..1ee60db462 100644 --- a/backends/platform/ps2/fileio.cpp +++ b/backends/platform/ps2/fileio.cpp @@ -23,6 +23,8 @@ // Disable symbol overrides so that we can use "FILE" #define FORBIDDEN_SYMBOL_EXCEPTION_FILE #define FORBIDDEN_SYMBOL_EXCEPTION_printf +#define FORBIDDEN_SYMBOL_EXCEPTION_abort +#define FORBIDDEN_SYMBOL_EXCEPTION_exit #include "backends/platform/ps2/fileio.h" diff --git a/backends/platform/ps2/ps2mutex.cpp b/backends/platform/ps2/ps2mutex.cpp index 440a7e2cce..62cc0db555 100644 --- a/backends/platform/ps2/ps2mutex.cpp +++ b/backends/platform/ps2/ps2mutex.cpp @@ -21,8 +21,11 @@ */ #define FORBIDDEN_SYMBOL_EXCEPTION_printf +#define FORBIDDEN_SYMBOL_EXCEPTION_abort +#define FORBIDDEN_SYMBOL_EXCEPTION_exit #include "backends/platform/ps2/systemps2.h" +#include <kernel.h> void OSystem_PS2::initMutexes(void) { ee_sema_t newSema; diff --git a/backends/plugins/ps2/ps2-provider.cpp b/backends/plugins/ps2/ps2-provider.cpp index a4a9877c61..c83f33e2ba 100644 --- a/backends/plugins/ps2/ps2-provider.cpp +++ b/backends/plugins/ps2/ps2-provider.cpp @@ -20,6 +20,9 @@ * */ +#define FORBIDDEN_SYMBOL_EXCEPTION_abort +#define FORBIDDEN_SYMBOL_EXCEPTION_exit + #include "common/scummsys.h" #if defined(DYNAMIC_MODULES) && defined(__PLAYSTATION2__) @@ -27,6 +30,8 @@ #include "backends/plugins/ps2/ps2-provider.h" #include "backends/plugins/elf/mips-loader.h" +#include <kernel.h> + class PS2DLObject : public MIPSDLObject { protected: @@ -2127,7 +2127,7 @@ fi # However, some platforms use GNU extensions in system header files, so # for these we must not use -pedantic. case $_host_os in -android | androidsdl | gamecube | psp | tizen | wii | webos) +android | androidsdl | gamecube | ps2 | psp | tizen | wii | webos) ;; *) # ICC does not support pedantic, while GCC and clang do. @@ -3296,7 +3296,7 @@ if test -n "$_host"; then # libtremor, while our code later on expects it to be called libvorbisidec. # TODO: Enable tremor, e.g. by adding -ltremor or by renaming the lib. # Disable this for older SDK as this breaks the build otherwise... - if test -z "$PS2SDK_OLD"; then + if test -z "$PS2SDK_OLD" && test "$_tremor" = auto; then _tremor=yes fi _mad=yes @@ -3499,6 +3499,10 @@ case $_backend in fi append_var LDFLAGS "-L$PS2SDK/ee/lib" append_var LDFLAGS "-L$PS2SDK/ports/lib" + if test -d "$PS2DEV/isjpcm"; then + append_var INCLUDES "-I$PS2DEV/isjpcm/include" + append_var LDFLAGS "-L$PS2DEV/isjpcm/lib" + fi append_var LIBS "-lmc -lpad -lmouse -lhdd -lpoweroff -lsjpcm" append_var LIBS "-lm -lc -lfileXio -lkernel -lstdc++" ;; |