[Scummvm-git-logs] scummvm master -> 174b0d18643a6fc14135157ec7c0e4e2deaeeb20

[digitall]

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:
174b0d1864 PS2: Fix compilation with latest PS2SDK


Commit: 174b0d18643a6fc14135157ec7c0e4e2deaeeb20
    https://github.com/scummvm/scummvm/commit/174b0d18643a6fc14135157ec7c0e4e2deaeeb20
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-09-14T02:33:16+01:00

Commit Message:
PS2: Fix compilation with latest PS2SDK

Changed paths:
    backends/fs/ps2/ps2-fs.cpp
    backends/platform/ps2/Gs2dScreen.cpp
    backends/platform/ps2/fileio.cpp
    backends/platform/ps2/ps2mutex.cpp
    backends/plugins/ps2/ps2-provider.cpp
    configure


diff --git a/backends/fs/ps2/ps2-fs.cpp b/backends/fs/ps2/ps2-fs.cpp
index eba740e..b6f184f 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 823defe..a11d701 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 205a688..1ee60db 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 440a7e2..62cc0db 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 a4a9877..c83f33e 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:
 
diff --git a/configure b/configure
index 36ab2c4..2f84601 100755
--- a/configure
+++ b/configure
@@ -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++"
 		;;