Permalink
Browse files

PS2: Fix compilation with latest PS2SDK

  • Loading branch information...
ccawley2011 authored and digitall committed Aug 15, 2018
1 parent 58f3aac commit 174b0d18643a6fc14135157ec7c0e4e2deaeeb20
@@ -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"
@@ -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>
@@ -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"
@@ -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;
@@ -20,13 +20,18 @@
*
*/
#define FORBIDDEN_SYMBOL_EXCEPTION_abort
#define FORBIDDEN_SYMBOL_EXCEPTION_exit
#include "common/scummsys.h"
#if defined(DYNAMIC_MODULES) && defined(__PLAYSTATION2__)
#include "backends/plugins/ps2/ps2-provider.h"
#include "backends/plugins/elf/mips-loader.h"
#include <kernel.h>
class PS2DLObject : public MIPSDLObject {
protected:
View
@@ -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++"
;;

0 comments on commit 174b0d1

Please sign in to comment.