mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2025-01-29 20:50:58 +00:00
PS3 was deposed
This commit is contained in:
Monster Iestyn
parent
49542cdaa1
commit
9c6e739005
20 changed files with 17 additions and 300 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
17
src/i_tcp.c
17
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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 3.6 KiB |
|
|
@ -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
|
||||
|
|
@ -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>
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#ifdef HAVE_SDL
|
||||
|
||||
#if defined (_WIN32_WCE) || defined(GP2X) || defined(_PS3)
|
||||
#if defined (_WIN32_WCE) || defined(GP2X)
|
||||
#define NOSDLCD
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)...
|
||||
|
|
|
|||
|
|
@ -57,13 +57,11 @@ int currentfonthinting;
|
|||
int currentfontoutline;
|
||||
#endif
|
||||
|
||||
#ifndef _PS3
|
||||
typedef struct
|
||||
{
|
||||
UINT16 width;
|
||||
UINT16 height;
|
||||
} VideoResolution;
|
||||
#endif
|
||||
UINT8 bitsperpixel;
|
||||
|
||||
typedef enum
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue