From 9c6e739005db7fed0918cd7ff06c75d89b4330c4 Mon Sep 17 00:00:00 2001
From: Monster Iestyn <iestynjealous@ntlworld.com>
Date: Fri, 29 Sep 2017 20:12:57 +0100
Subject: [PATCH] PS3 was deposed
---
src/Makefile | 9 ---
src/Makefile.cfg | 17 ----
src/d_main.c | 2 +-
src/doomdef.h | 2 +-
src/doomtype.h | 5 +-
src/i_addrinfo.c | 7 --
src/i_addrinfo.h | 12 +--
src/i_tcp.c | 17 +---
src/m_misc.c | 4 +-
src/mserv.c | 6 +-
src/sdl12/Makefile.cfg | 4 -
src/sdl12/SRB2PS3/ICON0.png | Bin 3678 -> 0 bytes
src/sdl12/SRB2PS3/Makefile.cfg | 139 ---------------------------------
src/sdl12/SRB2PS3/sfo.xml | 39 ---------
src/sdl12/i_cdmus.c | 2 +-
src/sdl12/i_main.c | 11 +--
src/sdl12/i_system.c | 20 ++---
src/sdl12/i_ttf.c | 12 +--
src/sdl12/i_ttf.h | 2 -
src/sdl12/i_video.c | 7 --
20 files changed, 17 insertions(+), 300 deletions(-)
delete mode 100644 src/sdl12/SRB2PS3/ICON0.png
delete mode 100644 src/sdl12/SRB2PS3/Makefile.cfg
delete mode 100644 src/sdl12/SRB2PS3/sfo.xml
diff --git a/src/Makefile b/src/Makefile
index 1ae91da3d..f25d34ec2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -160,11 +160,6 @@ NOHW=1
NOPOSTPROCESSING=1
endif
-ifdef PS3N
-NONX86=1
-NOHW=1
-endif
-
ifdef DJGPPDOS
include djgppdos/Makefile.cfg
endif
@@ -525,10 +520,6 @@ ifdef DJGPPDOS
all: pre-build $(BIN)/$(EXENAME)
endif
-ifdef PS3N
-all: pre-build $(BIN)/$(PKGNAME)
-endif
-
ifdef WII
all: pre-build $(BIN)/$(DOLNAME)
endif
diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index ff0619790..679727c90 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -213,7 +213,6 @@ endif
ifndef WINCE
ifndef PSP
ifndef WII
-ifndef PS3N
ifndef LINUX
ifndef FREEBSD
ifndef CYGWIN32
@@ -232,7 +231,6 @@ endif
endif
endif
endif
-endif
#determine the interface directory (where you put all i_*.c)
i_cdmus_o=$(OBJDIR)/i_cdmus.o
@@ -332,20 +330,6 @@ ifdef WII
BIN:=$(BIN)/Wii
NOUPX=1
else
-ifdef PS3N
- INTERFACE=sdl12
- NONX86=1
- STATIC=1
- PREFIX?=ppu
- SDL=1
- SDL12=1
- # unsure?
- #SDLMAIN=1
- # can't compile SDL_mixer for ps3...
- NOMIXER=1
- OBJDIR:=$(OBJDIR)/PS3
- BIN:=$(BIN)/PS3
-else
ifdef MINGW
INTERFACE=win32
NASMFORMAT=win32
@@ -387,7 +371,6 @@ endif
endif
endif
endif
-endif
ifdef GP2X
ifdef SDL
diff --git a/src/d_main.c b/src/d_main.c
index 7dab2430f..b2f586607 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -800,7 +800,7 @@ static void IdentifyVersion(void)
}
else
{
-#if !defined(_WIN32_WCE) && !defined(_PS3)
+#ifndef _WIN32_WCE
if (getcwd(srb2path, 256) != NULL)
srb2waddir = srb2path;
else
diff --git a/src/doomdef.h b/src/doomdef.h
index a38ce3ca4..2a9f7b1f3 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -381,7 +381,7 @@ enum {
};
// Name of local directory for config files and savegames
-#if !defined(_WIN32_WCE) && !defined(GP2X) && !defined(_WII) && !defined(_PS3)
+#if !defined(_WIN32_WCE) && !defined(GP2X) && !defined(_WII)
#if (((defined (__unix__) && !defined (MSDOS)) || defined (UNIXCOMMON)) && !defined (__CYGWIN__)) && !defined (__APPLE__)
#define DEFAULTDIR ".srb2"
#else
diff --git a/src/doomtype.h b/src/doomtype.h
index b94ac1fbd..d4ebbb92d 100644
--- a/src/doomtype.h
+++ b/src/doomtype.h
@@ -141,7 +141,7 @@ typedef long ssize_t;
#endif
#endif //macintosh
-#if defined (PC_DOS) || defined (_WIN32) || defined (_WII) || defined (_PSP) || defined (__HAIKU__) || defined(_NDS) || defined(_PS3)
+#if defined (PC_DOS) || defined (_WIN32) || defined (_WII) || defined (_PSP) || defined (__HAIKU__) || defined(_NDS)
#define HAVE_DOSSTR_FUNCS
#endif
@@ -179,9 +179,6 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
#define boolean BOOL
#elif defined(_NDS)
#define boolean bool
- #elif defined(_PS3) // defined(__GNUC__)?
- #include <stdbool.h> //_bool_true_false_are_defined?
- #define boolean bool
#else
typedef enum {false, true} boolean;
#endif
diff --git a/src/i_addrinfo.c b/src/i_addrinfo.c
index 64a30ca70..4634917be 100644
--- a/src/i_addrinfo.c
+++ b/src/i_addrinfo.c
@@ -25,12 +25,8 @@
#ifndef _NDS
#include <arpa/inet.h>
#endif
-#ifdef _PS3
-#include <net/netdb.h>
-#else
#include <netdb.h>
#endif
-#endif
#include "i_addrinfo.h"
@@ -262,9 +258,6 @@ int I_getaddrinfo(const char *node, const char *service,
for (i = 0, j = 0; i < ailen; i++, j++)
{
ai = *res+i;
-#ifdef _PS3
- addr[i].sin_len = famsize;
-#endif
addr[i].sin_port = htons((UINT16)sockport);
if (nodename)
{
diff --git a/src/i_addrinfo.h b/src/i_addrinfo.h
index 744ea0cf7..4cda8968b 100644
--- a/src/i_addrinfo.h
+++ b/src/i_addrinfo.h
@@ -39,17 +39,7 @@
#define EAI_NONAME -2
#endif
-#ifdef _PS3 // PSL1GHT v2
-struct my_addrinfo {
- int ai_flags;
- int ai_family;
- int ai_socktype;
- int ai_protocol;
- size_t ai_addrlen;
- struct sockaddr *ai_addr;
- struct my_addrinfo *ai_next;
-};
-#elif defined (_WIN32) // already use the stub for Win32
+#ifdef _WIN32 // already use the stub for Win32
// w32api, ws2tcpip.h, r1.12
struct my_addrinfo {
int ai_flags;
diff --git a/src/i_tcp.c b/src/i_tcp.c
index 90461a7d1..9254f5b45 100644
--- a/src/i_tcp.c
+++ b/src/i_tcp.c
@@ -23,10 +23,6 @@
#include <sys/time.h>
#endif // __OS2__
-#ifdef _PS3
-#define NO_IPV6 // PSL1GHT v2 do not have IPv6 support
-#endif
-
#ifndef NO_IPV6
#define HAVE_IPV6
#endif
@@ -70,10 +66,7 @@
#include <netinet/in.h>
#endif //normal BSD API
-#if defined (_PS3)
-#include <net/select.h>
-#include <net/net.h>
-#elif !defined(USE_WINSOCK)
+#ifndef USE_WINSOCK
#include <netdb.h>
#include <sys/ioctl.h>
#endif //normal BSD API
@@ -197,7 +190,7 @@ typedef SOCKET SOCKET_TYPE;
#define BADSOCKET INVALID_SOCKET
#define ERRSOCKET (SOCKET_ERROR)
#else
-#if (defined (__unix__) && !defined (MSDOS)) || defined (__APPLE__) || defined (__HAIKU__) || defined(_PS3)
+#if (defined (__unix__) && !defined (MSDOS)) || defined (__APPLE__) || defined (__HAIKU__)
typedef int SOCKET_TYPE;
#else
typedef unsigned long SOCKET_TYPE;
@@ -1196,9 +1189,6 @@ boolean I_InitTcpDriver(void)
CONS_Debug(DBG_NETPLAY, "No TCP/IP driver detected\n");
#endif // libsocket
#endif // __DJGPP__
-#ifdef _PS3
- netInitialize();
-#endif
#ifndef __DJGPP__
init_tcp_driver = true;
#endif
@@ -1255,9 +1245,6 @@ void I_ShutdownTcpDriver(void)
__lsck_uninit();
#endif // libsocket
#endif // __DJGPP__
-#ifdef _PS3
- netDeinitialize();
-#endif
CONS_Printf("shut down\n");
init_tcp_driver = false;
#endif
diff --git a/src/m_misc.c b/src/m_misc.c
index 25faf010e..a0efb8bf4 100644
--- a/src/m_misc.c
+++ b/src/m_misc.c
@@ -58,7 +58,7 @@ typedef off_t off64_t;
#if defined (_WIN32)
#define PRIdS "Iu"
-#elif defined (_PSP) || defined (DJGPP) || defined (_WII) || defined (_NDS) || defined (_PS3)
+#elif defined (_PSP) || defined (DJGPP) || defined (_WII) || defined (_NDS)
#define PRIdS "u"
#else
#define PRIdS "zu"
@@ -191,7 +191,7 @@ INT32 M_MapNumber(char first, char second)
// ==========================================================================
// some libcs has no access function, make our own
-#if defined (_WIN32_WCE) || defined (_WII) || defined (_PS3)
+#if defined (_WIN32_WCE) || defined (_WII)
int access(const char *path, int amode)
{
int accesshandle = -1;
diff --git a/src/mserv.c b/src/mserv.c
index 00eef419f..deda97a5f 100644
--- a/src/mserv.c
+++ b/src/mserv.c
@@ -50,12 +50,8 @@
#endif
#include <sys/socket.h> // socket(),...
#include <netinet/in.h> // sockaddr_in
-#ifdef _PS3
-#include <net/select.h>
-#else
#include <netdb.h> // getaddrinfo(),...
#include <sys/ioctl.h>
-#endif
#include <sys/time.h> // timeval,... (TIMEOUT)
#include <errno.h>
@@ -209,7 +205,7 @@ typedef SOCKET SOCKET_TYPE;
#define BADSOCKET INVALID_SOCKET
#define ERRSOCKET (SOCKET_ERROR)
#else
-#if (defined (__unix__) && !defined (MSDOS)) || defined (__APPLE__) || defined (__HAIKU__) || defined (_PS3)
+#if (defined (__unix__) && !defined (MSDOS)) || defined (__APPLE__) || defined (__HAIKU__)
typedef int SOCKET_TYPE;
#else
typedef unsigned long SOCKET_TYPE;
diff --git a/src/sdl12/Makefile.cfg b/src/sdl12/Makefile.cfg
index 0b488752e..cd7309c26 100644
--- a/src/sdl12/Makefile.cfg
+++ b/src/sdl12/Makefile.cfg
@@ -14,10 +14,6 @@ ifdef PANDORA
include sdl12/SRB2Pandora/Makefile.cfg
endif #ifdef PANDORA
-ifdef PS3N
-include sdl12/SRB2PS3/Makefile.cfg
-endif #ifdef PS3N
-
ifdef PSP
include sdl12/SRB2PSP/Makefile.cfg
endif #ifdef PSP
diff --git a/src/sdl12/SRB2PS3/ICON0.png b/src/sdl12/SRB2PS3/ICON0.png
deleted file mode 100644
index 140230c1e17bcf341498374ede7feea16ac5b54c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3678
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
XZL<1$ZvW%AK@De5S3j3^P6<r_Z<|=?
diff --git a/src/sdl12/SRB2PS3/Makefile.cfg b/src/sdl12/SRB2PS3/Makefile.cfg
deleted file mode 100644
index 80f8db7bc..000000000
--- a/src/sdl12/SRB2PS3/Makefile.cfg
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-# Makefile.cfg for SRB2 for the PlayStation 3 using PSL1GHT
-#
-
-# Check if PS3DEV and PSL1GHT is set in the environment. If so, continue with compilation.
-.SUFFIXES:
-
-ifeq ($(strip $(PS3DEV)),)
-$(error "Please set PS3DEV in your environment. export PS3DEV=<path to>ps3dev-toolchain")
-endif
-
-ifeq ($(strip $(PSL1GHT)),)
-$(error "Please set PSL1GHT in your environment. export PSL1GHT=<path to>PSL1GHT")
-endif
-
-# Set compiler flags
-
-# Disable same warning flags
-WFLAGS+=-Wno-shadow -Wno-char-subscripts -Wno-format
-
-ifdef JAILBREAK
-EXENAME?=SRB2PS3-jb.elf
-PKGNAME?=SRB2PS3-jb.pkg
-else
-EXENAME?=SRB2PS3.elf
-PKGNAME?=SRB2PS3.pkg
-endif
-DGBNAME?=$(EXENAME).debug
-
-SRB2PS3DIR=sdl12/SRB2PS3
-ICON0?=$(SRB2PS3DIR)/ICON0.png
-SFOXML?=sfo.xml
-SRB2TTF?=sdl12/srb2.ttf
-
-TITLE=Sonic Robo Blast 2 v2.0.6
-APPID=SRB2-PS3
-CONTENTID=UP0001-$(APPID)_00-0000000000000000
-
-FSELF=$(PS3DEV)/bin/fself.py
-MAKE_SELF_NPDRM=$(PS3DEV)/ps3publictools/make_self_npdrm
-FINALIZE=$(PS3DEV)/ps3publictools/package_finalize
-SFO=$(PS3DEV)/bin/sfo.py
-PKG=$(PS3DEV)/bin/pkg.py
-PS3LOADEXE=$(PS3DEV)/ps3tools/ps3load
-SED=sed
-MV=mv
-XARGS=xargs
-FOR=for
-SHXARGS:=$(XARGS)
-SHSED:=$(SED)
-SPRXLINKER=$(PS3DEV)/bin/sprxlinker
-
-ifdef JAILBREAK
-PKGDIR=$(BIN)/pkg-jb
-else
-PKGDIR=$(BIN)/pkg
-endif
-USRDIR=$(PKGDIR)/USRDIR
-ETCDIR=$(USRDIR)/etc
-WGET=wget -P $(ETCDIR) -c -nc
-
-ifndef ECHO
- FSELF:=@$(FSELF)
- MAKE_SELF_NPDRM:=@$(MAKE_SELF_NPDRM)
- FINALIZE:=@$(FINALIZE)
- SFO:=@$(SFO)
- PKG:=@$(PKG)
- PS3LOADEXE:=@$(PS3LOADEXE)
- SED:=@$(SED)
- MV:=@$(MV)
- SPRXLINKER:=@$(SPRXLINKER)
- XARGS:=@$(XARGS)
- FOR:=@(FOR)
-endif
-
-# SRB2PS3 needs SDL_ttf to display any console text
-SDL_TTF=1
-
-# newlib has no support for networking
-#NONET=1
-
-# use absolute paths because changing PATH variable breaks distcc
-PREFIX := $(PS3DEV)/ppu/bin/$(PREFIX)
-
-# PS3DEV toolchain libdir and includedir
-PS3DEV_INC := $(PS3DEV)/ppu/include
-PS3DEV_LIB := $(PS3DEV)/ppu/lib
-
-# PSL1GHT libdir and includedir
-PSL1GHT_INC := $(PSL1GHT)/ppu/include
-PSL1GHT_LIB := $(PSL1GHT)/ppu/lib
-
-PS3PORTS := $(PS3DEV)/portlibs
-PS3PORTS_BIN := $(PS3PORTS)/ppu/bin
-PS3PORTS_INC := $(PS3PORTS)/ppu/include
-
-PNG_CONFIG := $(PS3PORTS_BIN)/libpng-config
-# static compilation
-PNG_STATIC=1
-
-SDL_CONFIG := $(PS3PORTS_BIN)/sdl-config
-
-INCLUDE := -I$(PSL1GHT_INC) -I$(PS3DEV_INC) -I$(PS3PORTS_INC)
-
-OPTS+=-D_PS3 -DUNIXCOMMON
-CFLAGS+= -g $(INCLUDE) -L$(PSL1GHT_LIB) -L$(PS3DEV_LIB) -L$(PS3DEV)/lib
-CXXFLAGS+=$(CFLAGS)
-LDFLAGS+= -B$(PSL1GHT_LIB) -B$(PS3DEV_LIB) -B$(PS3DEV)/lib
-LIBS+=-lrsx
-ifndef NONET
-LIBS+=-lnet -lsysmodule
-endif
-
-$(BIN)/$(PKGNAME): $(OBJS) $(BIN)/$(EXENAME)
- @echo Linking $(PKGNAME)...
- -$(MKDIR) $(ETCDIR)
- $(CP) $(ICON0) $(PKGDIR)
- $(CP) $(SRB2TTF) $(ETCDIR)
-ifdef WITHDATA
- $(FOR) datafile in $(shell echo $(D_FILES) | $(SHSED) 's/\.srb/\.wad/' | $(SHXARGS) -n 1 basename); do \
- $(WGET) http://alam.srb2.org/SRB2/2.0.6-Final/Resources/$$datafile; \
- done
-endif
- $(SPRXLINKER) $(BIN)/$(EXENAME)
-ifdef JAILBREAK
- $(SED) 's/@@PS3_SYSTEM_VER@@/3.41/' $(SRB2PS3DIR)/$(SFOXML) > $(BIN)/$(SFOXML)
- $(FSELF) -n $(BIN)/$(EXENAME) $(USRDIR)/EBOOT.BIN
-else
- $(SED) 's/@@PS3_SYSTEM_VER@@/3.55/' $(SRB2PS3DIR)/$(SFOXML) > $(BIN)/$(SFOXML)
- $(MAKE_SELF_NPDRM) $(BIN)/$(EXENAME) $(USRDIR)/EBOOT.BIN $(CONTENTID)
-endif
- $(SFO) --title "$(TITLE)" --appid "$(APPID)" -f $(BIN)/$(SFOXML) $(PKGDIR)/PARAM.SFO
- $(PKG) --contentid $(CONTENTID) $(PKGDIR)/ $(BIN)/$(PKGNAME)
-ifndef JAILBREAK
- $(FINALIZE) $(BIN)/$(PKGNAME)
-endif
-
-run: $(BIN)/$(EXENAME)
- $(PS3LOADEXE) $(USRDIR)/EBOOT.BIN
diff --git a/src/sdl12/SRB2PS3/sfo.xml b/src/sdl12/SRB2PS3/sfo.xml
deleted file mode 100644
index d7719b540..000000000
--- a/src/sdl12/SRB2PS3/sfo.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" ?>
-<sfo>
- <value name="APP_VER" type="string">
- 02.06
- </value>
- <value name="ATTRIBUTE" type="integer">
- 0
- </value>
- <value name="BOOTABLE" type="integer">
- 1
- </value>
- <value name="CATEGORY" type="string">
- HG
- </value>
- <value name="LICENSE" type="string">
- This application was created with the official non-official SDK called PSL1GHT, for more information visit http://www.psl1ght.com/ . This is in no way associated with Sony Computer Entertainment Inc., please do not contact them for help, they will not be able to provide it.
- </value>
- <value name="PARENTAL_LEVEL" type="integer">
- 0
- </value>
- <value name="PS3_SYSTEM_VER" type="string">
- 0@@PS3_SYSTEM_VER@@00
- </value>
- <value name="RESOLUTION" type="integer">
- 63
- </value>
- <value name="SOUND_FORMAT" type="integer">
- 279
- </value>
- <value name="TITLE" type="string">
- Sonic Robo Blast 2
- </value>
- <value name="TITLE_ID" type="string">
- SRB200000
- </value>
- <value name="VERSION" type="string">
- 02.06
- </value>
-</sfo>
diff --git a/src/sdl12/i_cdmus.c b/src/sdl12/i_cdmus.c
index 09b7233cb..3f7910b7d 100644
--- a/src/sdl12/i_cdmus.c
+++ b/src/sdl12/i_cdmus.c
@@ -19,7 +19,7 @@
#ifdef HAVE_SDL
-#if defined (_WIN32_WCE) || defined(GP2X) || defined(_PS3)
+#if defined (_WIN32_WCE) || defined(GP2X)
#define NOSDLCD
#endif
diff --git a/src/sdl12/i_main.c b/src/sdl12/i_main.c
index 0fda50ecf..930096373 100644
--- a/src/sdl12/i_main.c
+++ b/src/sdl12/i_main.c
@@ -133,22 +133,13 @@ int main(int argc, char **argv)
myargv = argv; /// \todo pull out path to exe from this string
#ifdef HAVE_TTF
-#ifdef _PS3
- // apparently there is a bug in SDL_PSL1GHT which needs this to be set to work around
- SDL_setenv("SDL_VIDEODRIVER", "psl1ght", 1);
- I_StartupTTF(FONTPOINTSIZE, SDL_INIT_VIDEO, SDL_SWSURFACE|SDL_DOUBLEBUF);
-#elif defined(_WIN32)
+#ifdef _WIN32
I_StartupTTF(FONTPOINTSIZE, SDL_INIT_VIDEO|SDL_INIT_AUDIO, SDL_SWSURFACE);
#else
I_StartupTTF(FONTPOINTSIZE, SDL_INIT_VIDEO, SDL_SWSURFACE);
#endif
#endif
-#ifdef _PS3
- // initialise controllers.
- //ioPadInit(7);
-#endif
-
// init Wii-specific stuff
#ifdef _WII
// Start network
diff --git a/src/sdl12/i_system.c b/src/sdl12/i_system.c
index 83625c658..1d577b742 100644
--- a/src/sdl12/i_system.c
+++ b/src/sdl12/i_system.c
@@ -80,7 +80,7 @@ typedef BOOL (WINAPI *p_SetProcessAffinityMask) (HANDLE, DWORD_PTR);
#ifdef _PSP
//#include <pspiofilemgr.h>
-#elif !defined(_PS3)
+#else
#if defined (__unix__) || defined(__APPLE__) || (defined (UNIXCOMMON) && !defined (__HAIKU__) && !defined (_WII))
#if defined (__linux__)
#include <sys/vfs.h>
@@ -98,7 +98,6 @@ typedef BOOL (WINAPI *p_SetProcessAffinityMask) (HANDLE, DWORD_PTR);
#endif
#endif
-#ifndef _PS3
#if defined (__linux__) || (defined (UNIXCOMMON) && !defined (_PSP) && !defined (__HAIKU__) && !defined (_WII))
#ifndef NOTERMIOS
#include <termios.h>
@@ -106,10 +105,9 @@ typedef BOOL (WINAPI *p_SetProcessAffinityMask) (HANDLE, DWORD_PTR);
#define HAVE_TERMIOS
#endif
#endif
-#endif
#ifndef NOMUMBLE
-#if defined (__linux__) && !defined(_PS3) // need -lrt
+#ifdef __linux__ // need -lrt
#include <sys/mman.h>
#ifdef MAP_FAILED
#define HAVE_SHM
@@ -149,14 +147,6 @@ typedef BOOL (WINAPI *p_SetProcessAffinityMask) (HANDLE, DWORD_PTR);
#define DEFAULTWADLOCATION2 "usb:/srb2wii"
#define DEFAULTSEARCHPATH1 "sd:/srb2wii"
#define DEFAULTSEARCHPATH2 "usb:/srb2wii"
-// PS3: TODO: this will need modification most likely
-#elif defined (_PS3)
-#define NOCWD
-#define NOHOME
-#define DEFAULTWADLOCATION1 "/dev_hdd0/game/SRB2-PS3_/USRDIR/etc"
-#define DEFAULTWADLOCATION2 "/dev_usb/SRB2PS3"
-#define DEFAULTSEARCHPATH1 "/dev_hdd0/game/SRB2-PS3_/USRDIR/etc"
-#define DEFAULTSEARCHPATH2 "/dev_usb/SRB2PS3"
#elif defined (_PSP)
#define NOCWD
#define NOHOME
@@ -2449,7 +2439,7 @@ void I_GetDiskFreeSpace(INT64 *freespace)
#if defined (_PSP)
*freespace = 0;
#elif defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
-#if defined (SOLARIS) || defined (__HAIKU__) || defined (_WII) || defined (_PS3)
+#if defined (SOLARIS) || defined (__HAIKU__) || defined (_WII)
*freespace = INT32_MAX;
return;
#else // Both Linux and BSD have this, apparently.
@@ -2677,7 +2667,7 @@ static const char *locateWad(void)
if (((envstr = I_GetEnv("SRB2WADDIR")) != NULL) && isWadPathOk(envstr))
return envstr;
-#if defined(_WIN32_WCE) || defined(_PS3) || defined(_PSP)
+#if defined(_WIN32_WCE) || defined(_PSP)
// examine argv[0]
strcpy(returnWadPath, myargv[0]);
pathonly(returnWadPath);
@@ -2785,7 +2775,7 @@ const char *I_LocateWad(void)
// change to the directory where we found srb2.srb
#if defined (_WIN32) && !defined (_WIN32_WCE)
SetCurrentDirectoryA(waddir);
-#elif !defined (_WIN32_WCE) && !defined (_PS3)
+#elif !defined (_WIN32_WCE)
if (chdir(waddir) == -1)
I_OutputMsg("Couldn't change working directory\n");
#endif
diff --git a/src/sdl12/i_ttf.c b/src/sdl12/i_ttf.c
index 770a81d98..21f375a5f 100644
--- a/src/sdl12/i_ttf.c
+++ b/src/sdl12/i_ttf.c
@@ -26,10 +26,7 @@
#include "i_ttf.h"
// Search directories to find aforementioned TTF file.
-#ifdef _PS3
-#include <sysutil/video.h>
-#define FONTSEARCHPATH1 "/dev_hdd0/game/SRB2-PS3_/USRDIR/etc"
-#elif defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
+#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
#define FONTSEARCHPATH1 "/usr/share/fonts"
#define FONTSEARCHPATH2 "/usr/local/share/fonts"
#define FONTSEARCHPATH3 "/usr/games/SRB2"
@@ -233,16 +230,9 @@ void I_StartupTTF(UINT32 fontpointsize, Uint32 initflags, Uint32 vidmodeflags)
{
char *fontpath = NULL;
INT32 fontstatus = -1;
-#ifdef _PS3
- videoState state;
- videoGetState(0, 0, &state);
- videoGetResolution(state.displayMode.resolution, &res);
- bitsperpixel = 24;
-#else
res.width = 320;
res.height = 200;
bitsperpixel = 8;
-#endif
// what's the point of trying to display an error?
// SDL_ttf is not started, can't display anything to screen (presumably)...
diff --git a/src/sdl12/i_ttf.h b/src/sdl12/i_ttf.h
index 929c8021c..d755defcb 100644
--- a/src/sdl12/i_ttf.h
+++ b/src/sdl12/i_ttf.h
@@ -57,13 +57,11 @@ int currentfonthinting;
int currentfontoutline;
#endif
-#ifndef _PS3
typedef struct
{
UINT16 width;
UINT16 height;
} VideoResolution;
-#endif
UINT8 bitsperpixel;
typedef enum
diff --git a/src/sdl12/i_video.c b/src/sdl12/i_video.c
index 245d8ab4a..00e1a1b3d 100644
--- a/src/sdl12/i_video.c
+++ b/src/sdl12/i_video.c
@@ -109,8 +109,6 @@
#define MAXWINMODES (1)
#elif defined (WII)
#define MAXWINMODES (8)
-#elif defined (_PS3)
-#define MAXWINMODES (26)
#else
#define MAXWINMODES (27)
#endif
@@ -184,9 +182,7 @@ static INT32 windowedModes[MAXWINMODES][2] =
{
#if !(defined (_WIN32_WCE) || defined (PSP) || defined (GP2X))
#ifndef WII
-#ifndef _PS3
{1920,1200}, // 1.60,6.00
-#endif
{1680,1050}, // 1.60,5.25
{1600,1200}, // 1.33,5.00
{1600,1000}, // 1.60,5.00
@@ -1977,9 +1973,6 @@ void I_StartupGraphics(void)
#if defined(_WII)
vid.width = 640;
vid.height = 480;
-#elif defined(_PS3)
- vid.width = 720;
- vid.height = 480;
#else
vid.width = BASEVIDWIDTH;
vid.height = BASEVIDHEIGHT;
--
GitLab