diff --git a/Makefile.ps3 b/Makefile.ps3 deleted file mode 100644 index 2412aa97ec..0000000000 --- a/Makefile.ps3 +++ /dev/null @@ -1,207 +0,0 @@ -include version.all - -#which compiler to build with - GCC or SNC -#set to GCC for debug builds for use with debugger -CELL_BUILD_TOOLS = SNC -CELL_GPU_TYPE = RSX -CELL_PSGL_VERSION = opt - -ASSETS_DIR := media/assets - -# options -DOWNLOAD_SHADERS = 1 -STRIPPING_ENABLE = 0 -DEBUG = 0 -HAVE_GCMGL = 0 -HAVE_LOGGER = 0 -HAVE_FREETYPE = 0 -WHOLE_ARCHIVE_LINK = 0 - -CONTENT_ID_FULL = UP0001-SSNE10000_00-0000000000000001 -CONTENT_ID = SSNE10000 - -PC_DEVELOPMENT_IP_ADDRESS = "192.168.1.7" -PC_DEVELOPMENT_UDP_PORT = 3490 - -CELL_MK_DIR ?= $(CELL_SDK)/samples/mk -include $(CELL_MK_DIR)/sdk.makedef.mk - -PPU_TARGET = retroarch_ps3.elf -SALAMANDER_TARGET = retroarch-salamander_ps3.elf - -EBOOT_PATH = pkg/ps3/USRDIR/EBOOT.BIN -CORE_PATH = pkg/ps3/USRDIR/cores/CORE.SELF - -LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -INCDIRS = -I. \ - -Idefines \ - -Ideps \ - -Ideps/stb \ - -Ideps/rcheevos/include \ - -Ilibretro-common/include \ - -Ilibretro-common/include/compat/zlib - -# system platform -system_platform = unix -ifeq ($(shell uname -a),) -EXE_EXT = .exe - system_platform = win -else ifneq ($(findstring Darwin,$(shell uname -a)),) - system_platform = osx -else ifneq ($(findstring MINGW,$(shell uname -a)),) - system_platform = win -endif - -PKG_SCRIPT = tools/ps3/ps3py/pkg.py -ifeq ($(shell uname), Linux) -PKG_FINALIZE = package_finalize -MAKE_SELF_WC = make_self_wc -MAKE_SELF = make_self_npdrm -PYTHON2 = python2 -GIT = git -else -PKG_FINALIZE = package_finalize.exe -MAKE_SELF_WC = make_self_wc.exe -MAKE_SELF = make_self_npdrm.exe -PYTHON2 = python2.exe -GIT = git.exe -endif - -PPU_SRCS = griffin/griffin.c - -DEFINES += -DHAVE_VIDEO_LAYOUT -DEFINES += -DHAVE_MENU -DHAVE_CONFIGFILE -DHAVE_PATCH -DHAVE_CHEATS -DHAVE_GFX_WIDGETS -DHAVE_RGUI -DHAVE_XMB -DHAVE_OZONE -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DHAVE_SCREENSHOTS -DHAVE_REWIND -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD -DHAVE_DR_MP3 -DHAVE_DR_FLAC -DEFINES += -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES - -ifeq ($(DEX_BUILD), 1) -DEFINES += -DDEX_BUILD -endif - -ifeq ($(CEX_BUILD), 1) -DEFINES += -DCEX_BUILD -endif - -ifeq ($(ODE_BUILD), 1) -DEFINES += -DODE_BUILD -endif - -ifeq ($(HAVE_GCMGL), 1) -DEFINES += -DHAVE_GCMGL -GL_LIBS := -L. -lrgl_ps3 -else -GL_LIBS := -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc -endif - -ifeq ($(HAVE_FREETYPE), 1) -DEFINES += -DHAVE_FREETYPE -FONT_LIBS := -lfontFT_stub -lfreetype_stub -endif - -ifeq ($(CELL_BUILD_TOOLS), SNC) - PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe - PPU_CXX = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe - PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe -else ifneq ($(system_platform), win) - PPU_CXX = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe - PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe - PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe - PPU_CCLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe -endif - -ifeq ($(WHOLE_ARCHIVE_LINK), 1) -WHOLE_START := -Wl, --whole-archive -WHOLE_END := -Wl, --no-whole-archive -endif - -PPU_LDLIBS = $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -lcgc -lgcm_cmdasm -lgcm_sys_stub -lresc_stub -lm -lio_stub -lfs_stub -lsysutil_stub -lsysutil_game_stub -lsysutil_screenshot_stub -lsysutil_np_stub -lpngdec_stub -lsysmodule_stub -laudio_stub -lnet_stub -lnetctl_stub -lpthread - -PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe - -DEFINES += -DHAVE_THREADS -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_HEADSET -DHAVE_LANGEXTRA -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_7Z -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_FILTERS_BUILTIN -DHAVE_CHEEVOS -DRC_DISABLE_LUA -DHAVE_DSP_FILTER -DHAVE_VIDEO_FILTER - -#DEFINES += -DHAVE_IMAGEVIEWER - -ifeq ($(DEBUG), 1) - PPU_OPTIMIZE_LV := -O0 -g -else - PPU_OPTIMIZE_LV := -O2 -g -endif - -ifeq ($(HAVE_LOGGER), 1) -DEFINES += -DHAVE_LOGGER -endif - -PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES) -PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES) - -EXIST_EBOOT_WILDCARD := $(wildcard $(EBOOT_PATH)) -EXIST_CORE_WILDCARD := $(wildcard $(CORE_PATH)) - -EBOOT_EXISTS = 1 -CORE_EXISTS = 1 - -ifneq ($(strip $(EXIST_EBOOT_WILDCARD)),) -EBOOT_EXISTS = 0 -endif - -ifneq ($(strip $(EXIST_CORE_WILDCARD)),) -CORE_EXISTS = 0 -endif - -include $(CELL_MK_DIR)/sdk.target.mk - -MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe -MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe -MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe - -.PHONY: create-npdrm-core create-core create-npdrm-salamander create-shaders clean-selfs create-salamander - -create-npdrm-core: - $(MAKE_FSELF_NPDRM) $(PPU_TARGET) $(CORE_PATH) - -create-core: - $(MAKE_SELF_WC) $(PPU_TARGET) $(CORE_PATH) - -create-npdrm-salamander: - $(MAKE_FSELF_NPDRM) $(SALAMANDER_TARGET) $(EBOOT_PATH) - -create-salamander: - $(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL) - -copy-media-files: - @cp -r $(ASSETS_DIR)/glui pkg/ps3/USRDIR/cores/assets - @cp -r $(ASSETS_DIR)/xmb pkg/ps3/USRDIR/cores/assets - -create-shaders: - make -f Makefile.griffin platform=ps3 shaders-deploy - -pkg: $(PPU_TARGET) create-shaders copy-media-files create-npdrm-salamander create-npdrm-core - $(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf pkg/ps3 - -pkg-signed: $(PPU_TARGET) create-shaders copy-media-files create-salamander create-core - $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg - -pkg-signed-standalone: $(PPU_TARGET) create-shaders copy-media-files create-core - $(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID) - $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg - -pkg-signed-cfw: $(PPU_TARGET) create-shaders copy-media-files create-salamander create-core - $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg - $(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg - -pkg-signed-cfw-standalone: $(PPU_TARGET) create-shaders copy-media-files create-core - $(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID) - $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg - $(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg - -clean-selfs: -ifeq ($(EBOOT_EXISTS),1) - @echo "WARNING: Couldn't find file to delete: [$(EBOOT_PATH)], skipping this step." -else - rm $(EBOOT_PATH) -endif -ifeq ($(CORE_EXISTS),1) - @echo "WARNING: Couldn't find file to delete: [$(CORE_PATH)], skipping this step." -else - rm $(CORE_PATH) -endif diff --git a/Makefile.ps3.cobra b/Makefile.ps3.cobra deleted file mode 100644 index 3ba5423e5b..0000000000 --- a/Makefile.ps3.cobra +++ /dev/null @@ -1,196 +0,0 @@ -include version.all - -#which compiler to build with - GCC or SNC -#set to GCC for debug builds for use with debugger -CELL_BUILD_TOOLS = GCC -CELL_GPU_TYPE = RSX -CELL_PSGL_VERSION = ultra-opt - -# options -DOWNLOAD_SHADERS = 1 -STRIPPING_ENABLE = 0 -DEBUG = 0 -HAVE_GCMGL = 1 -HAVE_LOGGER = 0 -HAVE_FREETYPE = 0 -WHOLE_ARCHIVE_LINK = 0 - -CONTENT_ID_FULL = UP0001-SSNE10000_00-0000000000000001 -CONTENT_ID = SSNE10000 - -PC_DEVELOPMENT_IP_ADDRESS = "192.168.1.7" -PC_DEVELOPMENT_UDP_PORT = 3490 - -CELL_MK_DIR ?= $(CELL_SDK)/samples/mk -include $(CELL_MK_DIR)/sdk.makedef.mk - -PPU_TARGET = retroarch_ps3.elf -SALAMANDER_TARGET = retroarch-salamander_ps3.elf - -EBOOT_PATH = pkg/ps3/USRDIR/EBOOT.BIN -CORE_PATH = pkg/ps3/USRDIR/cores/CORE.SELF - -LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -INCDIRS = -I. -Idefines -Ideps -Ideps/stb - -# system platform -system_platform = unix -ifeq ($(shell uname -a),) -EXE_EXT = .exe - system_platform = win -else ifneq ($(findstring Darwin,$(shell uname -a)),) - system_platform = osx -else ifneq ($(findstring MINGW,$(shell uname -a)),) - system_platform = win -endif - -PKG_SCRIPT = tools/ps3/ps3py/pkg.py -ifeq ($(shell uname), Linux) -PKG_FINALIZE = package_finalize -MAKE_SELF_WC = make_self_wc -MAKE_SELF = make_self_npdrm -PYTHON2 = python2 -GIT = git -else -PKG_FINALIZE = package_finalize.exe -MAKE_SELF_WC = make_self_wc.exe -MAKE_SELF = make_self_npdrm.exe -PYTHON2 = python2.exe -GIT = git.exe -endif - -PPU_SRCS = griffin/griffin.c - -DEFINES += -DHAVE_RGUI -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_MENU -DRARCH_INTERNAL - -ifeq ($(DEX_BUILD), 1) -DEFINES += -DDEX_BUILD -endif - -ifeq ($(CEX_BUILD), 1) -DEFINES += -DCEX_BUILD -endif - -ifeq ($(ODE_BUILD), 1) -DEFINES += -DODE_BUILD -endif - -ifeq ($(HAVE_GCMGL), 1) -DEFINES += -DHAVE_GCMGL -GL_LIBS := -L. -lrgl_ps3 -else -GL_LIBS := -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc -endif - -ifeq ($(HAVE_FREETYPE), 1) -DEFINES += -DHAVE_FREETYPE -FONT_LIBS := -lfontFT_stub -lfreetype_stub -endif - -ifeq ($(CELL_BUILD_TOOLS), SNC) - PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe - PPU_CXX = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe - PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe -else ifneq($(system_platform), win) - PPU_CXX = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-g++.exe - PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe - PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe - PPU_CCLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe -endif - -ifeq ($(WHOLE_ARCHIVE_LINK), 1) -WHOLE_START := -Wl, --whole-archive -WHOLE_END := -Wl, --no-whole-archive -endif - -PPU_LDLIBS = $(FONT_LIBS) $(GL_LIBS) $(WHOLE_START) -lretro_ps3 $(WHOLE_END) -lcgc -lgcm_cmdasm -lgcm_sys_stub -lresc_stub -lm -lio_stub -lfs_stub -lsysutil_stub -lsysutil_game_stub -lsysutil_screenshot_stub -lsysutil_np_stub -lpngdec_stub -ljpgdec_stub -lsysmodule_stub -laudio_stub -lnet_stub -lnetctl_stub -lpthread - -PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe - -#DEFINES += -DHAVE_VIDEO_LAYOUT -DEFINES += -DHAVE_THREADS -DHAVE_SCREENSHOTS -DHAVE_REWIND -DHAVE_PATCH -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_HEADSET -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RSOUND -DHAVE_ZLIB -DHAVE_RPNG -D__CELLOS_LV2__ -DHAVE_NETWORKING=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=0 -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) -DHAVE_STB_VORBIS - -ifeq ($(DEBUG), 1) - PPU_OPTIMIZE_LV := -O0 -g -else - PPU_OPTIMIZE_LV := -O3 -g -endif - -ifeq ($(HAVE_LOGGER), 1) -DEFINES += -DHAVE_LOGGER -endif - -PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES) -PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES) - -EXIST_EBOOT_WILDCARD := $(wildcard $(EBOOT_PATH)) -EXIST_CORE_WILDCARD := $(wildcard $(CORE_PATH)) - -EBOOT_EXISTS = 1 -CORE_EXISTS = 1 - -ifneq ($(strip $(EXIST_EBOOT_WILDCARD)),) -EBOOT_EXISTS = 0 -endif - -ifneq ($(strip $(EXIST_CORE_WILDCARD)),) -CORE_EXISTS = 0 -endif - -include $(CELL_MK_DIR)/sdk.target.mk - -MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe -MAKE_FSELF_NPDRM = $(CELL_SDK)/host-win32/bin/make_fself_npdrm.exe -MAKE_PACKAGE_NPDRM = $(CELL_SDK)/host-win32/bin/make_package_npdrm.exe - -.PHONY: create-npdrm-core create-core create-npdrm-salamander create-shaders clean-selfs create-salamander - -create-npdrm-core: - $(MAKE_FSELF_NPDRM) $(PPU_TARGET) $(CORE_PATH) - -create-core: - $(MAKE_SELF_WC) $(PPU_TARGET) $(CORE_PATH) - -create-npdrm-salamander: - $(MAKE_FSELF_NPDRM) $(SALAMANDER_TARGET) $(EBOOT_PATH) - -create-salamander: - $(MAKE_SELF) $(SALAMANDER_TARGET) $(EBOOT_PATH) $(CONTENT_ID_FULL) - -copy-media-files: - @cp -r $(ASSETS_DIR)/glui pkg/ps3/USRDIR/cores/assets - @cp -r $(ASSETS_DIR)/xmb pkg/ps3/USRDIR/cores/assets - -create-shaders: - make -f Makefile.shaders deploy-ps3 - -pkg: $(PPU_TARGET) create-shaders copy-media-files create-npdrm-salamander create-npdrm-core - $(MAKE_PACKAGE_NPDRM) pkg/ps3/package.conf pkg/ps3 - -pkg-signed: $(PPU_TARGET) create-shaders copy-media-files create-salamander create-core - $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg - -pkg-signed-standalone: $(PPU_TARGET) create-shaders copy-media-files create-core - $(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID) - $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg - -pkg-signed-cfw: $(PPU_TARGET) create-shaders copy-media-files create-salamander create-core - $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg - $(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg - -pkg-signed-cfw-standalone: $(PPU_TARGET) create-shaders copy-media-files create-core - $(MAKE_SELF) $(PPU_TARGET) $(EBOOT_PATH) $(CONTENT_ID) - $(PYTHON2) $(PKG_SCRIPT) --contentid $(CONTENT_ID_FULL) pkg/ps3 retroarch-ps3-cfw-$(PACKAGE_VERSION).pkg - $(PKG_FINALIZE) retroarch-ps3-cfw-$(PACKAGE_VERSION)-kmeaw.pkg - -clean-selfs: -ifeq ($(EBOOT_EXISTS),1) - @echo "WARNING: Couldn't find file to delete: [$(EBOOT_PATH)], skipping this step." -else - rm $(EBOOT_PATH) -endif -ifeq ($(CORE_EXISTS),1) - @echo "WARNING: Couldn't find file to delete: [$(CORE_PATH)], skipping this step." -else - rm $(CORE_PATH) -endif diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander deleted file mode 100644 index 5309179414..0000000000 --- a/Makefile.ps3.salamander +++ /dev/null @@ -1,91 +0,0 @@ -CELL_BUILD_TOOLS = GCC -CELL_SDK ?= /usr/local/cell -HAVE_LOGGER = 0 -CELL_MK_DIR ?= $(CELL_SDK)/samples/mk - -include $(CELL_MK_DIR)/sdk.makedef.mk - -# system platform -system_platform = unix -ifeq ($(shell uname -a),) -EXE_EXT = .exe - system_platform = win -else ifneq ($(findstring Darwin,$(shell uname -a)),) - system_platform = osx -else ifneq ($(findstring MINGW,$(shell uname -a)),) - system_platform = win -endif - -ifeq ($(DEBUG), 1) - PPU_OPTIMIZE_LV := -O0 -g -else - PPU_OPTIMIZE_LV := -O2 -DNDEBUG -endif - -STRIP = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe - -INCFLAGS = -I. -Idefines -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -DEFINES = -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC - -ifeq ($(DEX_BUILD), 1) -DEFINES += -DDEX_BUILD -endif - -ifeq ($(CEX_BUILD), 1) -DEFINES += -DCEX_BUILD -endif - -ifeq ($(ODE_BUILD), 1) -DEFINES += -DODE_BUILD -endif - -PPU_CFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES) -PPU_CXXFLAGS := $(PPU_OPTIMIZE_LV) $(INCFLAGS) $(DEFINES) - -PPU_SRCS = frontend/frontend_salamander.c \ - frontend/frontend_driver.c \ - frontend/drivers/platform_ps3.c \ - libretro-common/file/file_path.c \ - libretro-common/file/file_path_io.c \ - libretro-common/lists/dir_list.c \ - libretro-common/lists/string_list.c \ - libretro-common/file/retro_dirent.c \ - libretro-common/hash/rhash.c \ - libretro-common/string/stdstring.c \ - libretro-common/encodings/encoding_utf.c \ - libretro-common/compat/compat_strl.c \ - libretro-common/compat/compat_strcasestr.c \ - libretro-common/compat/fopen_utf8.c \ - libretro-common/streams/file_stream.c \ - libretro-common/vfs/vfs_implementation.c \ - libretro-common/file/config_file.c \ - libretro-common/time/rtime.c \ - verbosity.c - -ifeq ($(HAVE_LOGGER), 1) -PPU_CFLAGS += -DHAVE_LOGGER -PPU_SRCS += network/net_logger.c \ - libretro-common/net/net_compat.c \ - libretro-common/net/net_socket.c -endif - -PPU_TARGET = retroarch-salamander_ps3.elf - -ifeq ($(CELL_BUILD_TOOLS),SNC) - PPU_CFLAGS += -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1 - PPU_CXXFLAGS += -Xbranchless=1 -Xfastmath=1 -Xassumecorrectsign=1 -Xassumecorrectalignment=1 -Xunroll=1 -Xautovecreg=1 - PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe - PPU_CLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe - PPU_CC = $(CELL_SDK)/host-win32/sn/bin/ps3ppusnc.exe -else - PPU_CFLAGS += -std=gnu99 - PPU_CC = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-gcc.exe - PPU_CLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe - PPU_CXXLD = $(CELL_SDK)/host-win32/sn/bin/ps3ppuld.exe -endif - -PPU_LDLIBS += -lm -lnet_stub -lnetctl_stub -lio_stub -lsysmodule_stub -lsysutil_stub -lsysutil_game_stub -lfs_stub -lsysutil_np_stub - -MAKE_FSELF = $(CELL_SDK)/host-win32/bin/make_fself.exe - -include $(CELL_MK_DIR)/sdk.target.mk diff --git a/Makefile.psl1ght b/Makefile.psl1ght index 1fae26721f..1055588bf3 100644 --- a/Makefile.psl1ght +++ b/Makefile.psl1ght @@ -30,7 +30,7 @@ CORE_PATH = pkg/psl1ght/pkg/USRDIR/cores/CORE.SELF INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude LIBDIRS += -L. -MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__ -mcpu=cell +MACHDEP := -D__PSL1GHT__ -mcpu=cell CFLAGS += -Wall $(MACHDEP) $(INCLUDE) LDFLAGS := $(MACHDEP) LIBS := -lretro_psl1ght -laudio -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl diff --git a/Makefile.psl1ght.salamander b/Makefile.psl1ght.salamander index 79bd18ac6e..f34b01bce2 100644 --- a/Makefile.psl1ght.salamander +++ b/Makefile.psl1ght.salamander @@ -30,7 +30,7 @@ EBOOT_PATH = pkg/psl1ght/pkg/USRDIR/EBOOT.BIN INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude LIBDIRS += -L. -MACHDEP := -D__CELLOS_LV2__ -D__PSL1GHT__ -mcpu=cell -mhard-float -fmodulo-sched -ffunction-sections -fdata-sections +MACHDEP := -D__PSL1GHT__ -mcpu=cell -mhard-float -fmodulo-sched -ffunction-sections -fdata-sections CFLAGS += -Wall $(MACHDEP) $(INCLUDE) LDFLAGS := $(MACHDEP) LIBS := -lgcm_sys -lrsx -lsysutil -lio -lnet -lsysmodule -lrt -llv2 -lm diff --git a/audio/drivers/ps3_audio.c b/audio/drivers/ps3_audio.c index c0e057eca9..40a5074d08 100644 --- a/audio/drivers/ps3_audio.c +++ b/audio/drivers/ps3_audio.c @@ -39,11 +39,7 @@ typedef struct volatile bool quit_thread; } ps3_audio_t; -#ifdef __PSL1GHT__ static void event_loop(void *data) -#else -static void event_loop(uint64_t data) -#endif { float out_tmp[CELL_AUDIO_BLOCK_SAMPLES * AUDIO_CHANNELS] __attribute__((aligned(16))); @@ -112,21 +108,11 @@ static void *ps3_audio_init(const char *device, data->buffer = fifo_new(CELL_AUDIO_BLOCK_SAMPLES * AUDIO_CHANNELS * AUDIO_BLOCKS * sizeof(float)); -#ifdef __PSL1GHT__ sys_lwmutex_attr_t lock_attr = {SYS_LWMUTEX_ATTR_PROTOCOL, SYS_LWMUTEX_ATTR_RECURSIVE, "\0"}; sys_lwmutex_attr_t cond_lock_attr = {SYS_LWMUTEX_ATTR_PROTOCOL, SYS_LWMUTEX_ATTR_RECURSIVE, "\0"}; sys_lwcond_attribute_t cond_attr = {"\0"}; -#else - sys_lwmutex_attribute_t lock_attr; - sys_lwmutex_attribute_t cond_lock_attr; - sys_lwcond_attribute_t cond_attr; - - sys_lwmutex_attribute_initialize(lock_attr); - sys_lwmutex_attribute_initialize(cond_lock_attr); - sys_lwcond_attribute_initialize(cond_attr); -#endif sys_lwmutex_create(&data->lock, &lock_attr); sys_lwmutex_create(&data->cond_lock, &cond_lock_attr); @@ -135,11 +121,7 @@ static void *ps3_audio_init(const char *device, cellAudioPortStart(data->audio_port); data->started = true; sys_ppu_thread_create(&data->thread, event_loop, -#ifdef __PSL1GHT__ data, -#else - (uint64_t)data, -#endif 1500, 0x1000, SYS_PPU_THREAD_CREATE_JOINABLE, (char*)"sound"); return data; diff --git a/audio/librsound.c b/audio/librsound.c index 0eaa106ce0..837674fbc1 100644 --- a/audio/librsound.c +++ b/audio/librsound.c @@ -31,16 +31,7 @@ #include "drivers/rsound.h" -#if defined(__CELLOS_LV2__) -#include -#include -#include - -/* Network headers */ -#include -#include -#define NETWORK_COMPAT_HEADERS 1 -#elif defined(GEKKO) +#if defined(GEKKO) #include #else #define NETWORK_COMPAT_HEADERS 1 @@ -52,12 +43,8 @@ #include #include #include -#ifdef __CELLOS_LV2__ -#include -#else #include #endif -#endif #include #ifdef _WIN32 #include @@ -107,16 +94,7 @@ enum rsd_conn_type #define RSD_ERR(fmt, args...) #define RSD_DEBUG(fmt, args...) -#if defined(__CELLOS_LV2__) -static int init_count = 0; -#define pollfd_fd(x) x.fd -#define net_send(a,b,c,d) send(a,b,c,d) -#define net_socket(a,b,c) socket(a,b,c) -#define net_connect(a,b,c) connect(a,b,c) -#define net_shutdown(a,b) shutdown(a,b) -#define net_socketclose(x) socketclose(x) -#define net_recv(a,b,c,d) recv(a,b,c,d) -#elif defined(GEKKO) +#if defined(GEKKO) #define SHUT_RD 0 #define socketpoll(x, y, z) net_poll(x, y, z) @@ -254,13 +232,8 @@ static int rsnd_connect_server( rsound_t *rd ) /* Uses non-blocking IO since it performed more deterministic with poll()/send() */ -#ifdef __CELLOS_LV2__ - setsockopt(rd->conn.socket, SOL_SOCKET, SO_NBIO, &i, sizeof(int)); - setsockopt(rd->conn.ctl_socket, SOL_SOCKET, SO_NBIO, &i, sizeof(int)); -#else fcntl(rd->conn.socket, F_SETFL, O_NONBLOCK); fcntl(rd->conn.ctl_socket, F_SETFL, O_NONBLOCK); -#endif /* Nonblocking connect with 3 second timeout */ net_connect(rd->conn.socket, (struct sockaddr*)&addr, sizeof(addr)); @@ -725,8 +698,6 @@ static int64_t rsnd_get_time_usec(void) if (!QueryPerformanceCounter(&count)) return 0; return count.QuadPart * 1000000 / freq.QuadPart; -#elif defined(__CELLOS_LV2__) - return sys_time_get_system_time(); #elif defined(GEKKO) return ticks_to_microsecs(gettime()); #elif defined(__MACH__) // OSX doesn't have clock_gettime ... @@ -1375,12 +1346,7 @@ int rsd_exec(rsound_t *rsound) rsnd_stop_thread(rsound); -#if defined(__CELLOS_LV2__) - int i = 0; - setsockopt(rsound->conn.socket, SOL_SOCKET, SO_NBIO, &i, sizeof(int)); -#else fcntl(rsound->conn.socket, F_SETFL, O_NONBLOCK); -#endif /* Flush the buffer */ if (FIFO_READ_AVAIL(rsound->fifo_buffer) > 0 ) @@ -1567,15 +1533,6 @@ int rsd_init(rsound_t** rsound) rsd_set_param(*rsound, RSD_HOST, RSD_DEFAULT_HOST); rsd_set_param(*rsound, RSD_PORT, RSD_DEFAULT_PORT); -#ifdef __CELLOS_LV2__ - if (init_count == 0) - { - cellSysmoduleLoadModule(CELL_SYSMODULE_NET); - sys_net_initialize_network(); - init_count++; - } -#endif - return 0; } diff --git a/config.def.h b/config.def.h index 7f3529cfdb..b743428fda 100644 --- a/config.def.h +++ b/config.def.h @@ -50,7 +50,7 @@ #define MAX_GAMMA_SETTING 1 #endif -#if defined(XENON) || defined(_XBOX360) || defined(__CELLOS_LV2__) +#if defined(XENON) || defined(_XBOX360) #define DEFAULT_ASPECT_RATIO 1.7778f #elif defined(_XBOX1) || defined(GEKKO) || defined(ANDROID) #define DEFAULT_ASPECT_RATIO 1.3333f @@ -364,7 +364,7 @@ /* 1:1 PAR */ #define DEFAULT_ASPECT_RATIO_AUTO false -#if defined(__CELLOS_LV2) || defined(_XBOX360) +#if defined(_XBOX360) #define DEFAULT_ASPECT_RATIO_IDX ASPECT_RATIO_16_9 #elif defined(PSP) || defined(_3DS) || defined(HAVE_LIBNX) || defined(VITA) #define DEFAULT_ASPECT_RATIO_IDX ASPECT_RATIO_CORE @@ -680,7 +680,7 @@ static const bool default_savefiles_in_content_dir = false; static const bool default_systemfiles_in_content_dir = false; static const bool default_screenshots_in_content_dir = false; -#if defined(__CELLOS_LV2__) || defined(_XBOX1) || defined(_XBOX360) || defined(DINGUX) +#if defined(_XBOX1) || defined(_XBOX360) || defined(DINGUX) static const unsigned menu_toggle_gamepad_combo = INPUT_TOGGLE_L3_R3; #elif defined(PS2) || defined(PSP) static const unsigned menu_toggle_gamepad_combo = INPUT_TOGGLE_HOLD_START; @@ -1275,7 +1275,7 @@ static const bool ui_companion_toggle = false; #define DEFAULT_UI_MENUBAR_ENABLE true -#if defined(__QNX__) || defined(_XBOX1) || defined(_XBOX360) || defined(__CELLOS_LV2__) || (defined(__MACH__) && defined(IOS)) || defined(ANDROID) || defined(WIIU) || defined(HAVE_NEON) || defined(GEKKO) || defined(__ARM_NEON__) +#if defined(__QNX__) || defined(_XBOX1) || defined(_XBOX360) || (defined(__MACH__) && defined(IOS)) || defined(ANDROID) || defined(WIIU) || defined(HAVE_NEON) || defined(GEKKO) || defined(__ARM_NEON__) static const enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWER; #elif defined(PSP) || defined(_3DS) || defined(VITA) || defined(PS2) || defined(DINGUX) static const enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWEST; @@ -1400,12 +1400,6 @@ static const bool enable_device_vibration = false; #define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/wiiu/latest/" #elif defined(HAVE_LIBNX) #define DEFAULT_BUILDBOT_SERVER_URL "http://buildbot.libretro.com/nightly/nintendo/switch/libnx/latest/" -#elif defined(__CELLOS_LV2__) && defined(DEX_BUILD) -#define DEFAULT_BUILDBOT_SERVER_URL "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/dex-ps3/" -#elif defined(__CELLOS_LV2__) && defined(CEX_BUILD) -#define DEFAULT_BUILDBOT_SERVER_URL "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/cex-ps3/" -#elif defined(__CELLOS_LV2__) && defined(ODE_BUILD) -#define DEFAULT_BUILDBOT_SERVER_URL "http://libretro.xbins.org/libretro/nightly/playstation/ps3/latest/ode-ps3/" #else #define DEFAULT_BUILDBOT_SERVER_URL "" #endif diff --git a/configuration.c b/configuration.c index d502377df6..6cc37f3d0b 100644 --- a/configuration.c +++ b/configuration.c @@ -260,7 +260,7 @@ static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_METAL; #endif #elif defined(HAVE_VITA2D) static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_VITA2D; -#elif (defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) || defined(__CELLOS_LV2__)) && !defined(__WINRT__) && !defined(__HAIKU__) +#elif (defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL; #elif defined(HAVE_OPENGL_CORE) && !defined(__HAIKU__) static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL_CORE; @@ -314,9 +314,7 @@ static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_EXT; static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_NULL; #endif -#if defined(__CELLOS_LV2__) -static const enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_PS3; -#elif defined(XENON) +#if defined(XENON) static const enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_XENON360; #elif defined(GEKKO) static const enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_WII; @@ -412,8 +410,6 @@ static const enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_DINPUT; static const enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_WINRAW; #elif defined(ORBIS) static const enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_PS4; -#elif defined(__CELLOS_LV2__) -static const enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_PS3; #elif defined(PSP) || defined(VITA) static const enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_PSP; #elif defined(PS2) @@ -450,9 +446,7 @@ static const enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_DOS; static const enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_NULL; #endif -#if defined(__CELLOS_LV2__) -static const enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_PS3; -#elif defined(HAVE_XINPUT) +#if defined(HAVE_XINPUT) static const enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_XINPUT; #elif defined(GEKKO) static const enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_GX; diff --git a/defines/ps3_defines.h b/defines/ps3_defines.h index 5fb6b94c16..c0f4196438 100644 --- a/defines/ps3_defines.h +++ b/defines/ps3_defines.h @@ -335,8 +335,6 @@ extern int audioAddData(uint32_t portNum, float *data, uint32_t frames, float vo #define SYS_PROCESS_PRIMARY_STACK_SIZE_1M SYS_PROCESS_SPAWN_STACK_SIZE_1M #define SYS_PPU_THREAD_CREATE_JOINABLE 0 /* FIXME - not sure if this is correct */ -#elif defined(__CELLOS_LV2__) -#include #endif /*============================================================ diff --git a/deps/mbedtls/net_sockets.c b/deps/mbedtls/net_sockets.c index 8818f13116..df819d0e43 100644 --- a/deps/mbedtls/net_sockets.c +++ b/deps/mbedtls/net_sockets.c @@ -54,7 +54,7 @@ #include #include -#if defined(__CELLOS_LV2__) || defined(WIIU) +#if defined(WIIU) #define close(fd) socketclose(fd) #elif defined(VITA) #define close(fd) sceNetSocketClose(fd) @@ -420,7 +420,7 @@ int mbedtls_net_accept( mbedtls_net_context *bind_ctx, */ int mbedtls_net_set_block( mbedtls_net_context *ctx ) { -#if defined(__CELLOS_LV2__) || defined(VITA) || defined(WIIU) +#if defined(VITA) || defined(WIIU) int i = 0; setsockopt(ctx->fd, SOL_SOCKET, SO_NBIO, &i, sizeof(int)); return 1; @@ -435,7 +435,7 @@ int mbedtls_net_set_block( mbedtls_net_context *ctx ) int mbedtls_net_set_nonblock( mbedtls_net_context *ctx ) { -#if defined(__CELLOS_LV2__) || defined(VITA) || defined(WIIU) +#if defined(VITA) || defined(WIIU) int i = 1; setsockopt(ctx->fd, SOL_SOCKET, SO_NBIO, &i, sizeof(int)); return 1; @@ -524,9 +524,7 @@ int mbedtls_net_recv_timeout( void *ctx, unsigned char *buf, size_t len, tv.tv_sec = timeout / 1000; tv.tv_usec = ( timeout % 1000 ) * 1000; -#if defined(__CELLOS_LV2__) - ret = socketselect(fd + 1, &read_fds, NULL, NULL, timeout == 0 ? NULL : &tv); -#elif defined(VITA) +#if defined(VITA) extern int retro_epoll_fd; SceNetEpollEvent ev = {0}; diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c index 444822a4ec..4a90bb4fa6 100644 --- a/frontend/frontend_driver.c +++ b/frontend/frontend_driver.c @@ -78,8 +78,6 @@ static frontend_ctx_driver_t frontend_ctx_null = { static frontend_ctx_driver_t *frontend_ctx_drivers[] = { #if defined(EMSCRIPTEN) &frontend_ctx_emscripten, -#elif defined(__CELLOS_LV2__) - &frontend_ctx_ps3, #endif #if defined(_XBOX) &frontend_ctx_xdk, @@ -183,7 +181,7 @@ bool frontend_driver_get_core_extension(char *s, size_t len) #else -#if defined(__CELLOS_LV2__) +#if defined(__PSL1GHT__) strcpy_literal(s, "self|bin"); return true; #elif defined(PSP) @@ -235,7 +233,7 @@ bool frontend_driver_get_salamander_basename(char *s, size_t len) return false; #else -#if defined(__CELLOS_LV2__) +#if defined(__PSL1GHT__) strcpy_literal(s, "EBOOT.BIN"); return true; #elif defined(PSP) diff --git a/gfx/font_driver.c b/gfx/font_driver.c index ebe9dfea76..eb649b4417 100644 --- a/gfx/font_driver.c +++ b/gfx/font_driver.c @@ -35,7 +35,7 @@ static const font_renderer_driver_t *font_backends[] = { &coretext_font_renderer, #endif #ifdef HAVE_STB_FONT -#if defined(VITA) || defined(WIIU) || defined(ANDROID) || (defined(_WIN32) && !defined(_XBOX) && !defined(_MSC_VER) && _MSC_VER >= 1400) || (defined(_WIN32) && !defined(_XBOX) && defined(_MSC_VER)) || defined(__CELLOS_LV2__) || defined(HAVE_LIBNX) || defined(__linux__) || defined (HAVE_EMSCRIPTEN) || defined(__APPLE__) || defined(HAVE_ODROIDGO2) +#if defined(VITA) || defined(WIIU) || defined(ANDROID) || (defined(_WIN32) && !defined(_XBOX) && !defined(_MSC_VER) && _MSC_VER >= 1400) || (defined(_WIN32) && !defined(_XBOX) && defined(_MSC_VER)) || defined(HAVE_LIBNX) || defined(__linux__) || defined (HAVE_EMSCRIPTEN) || defined(__APPLE__) || defined(HAVE_ODROIDGO2) &stb_unicode_font_renderer, #else &stb_font_renderer, diff --git a/griffin/griffin.c b/griffin/griffin.c index e7fd10e7ce..d0b2f110a4 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -262,9 +262,7 @@ VIDEO CONTEXT #endif -#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) -#include "../gfx/drivers_context/ps3_ctx.c" -#elif defined(ANDROID) +#if defined(ANDROID) #include "../gfx/drivers_context/android_ctx.c" #if defined(HAVE_VULKAN) #include "../gfx/drivers_context/android_vk_ctx.c" @@ -683,13 +681,8 @@ INPUT #include "../input/input_autodetect_builtin.c" -#if defined(__CELLOS_LV2__) -#ifdef __PSL1GHT__ +#if defined(__PSL1GHT__) #include "../input/drivers/psl1ght_input.c" -#else -#include "../input/drivers/ps3_input.c" -#include "../input/drivers_joypad/ps3_joypad.c" -#endif #elif defined(SN_TARGET_PSP2) || defined(PSP) || defined(VITA) #include "../input/drivers/psp_input.c" #include "../input/drivers_joypad/psp_joypad.c" @@ -903,7 +896,7 @@ RSOUND /*============================================================ AUDIO ============================================================ */ -#if defined(__CELLOS_LV2__) +#if defined(__PSL1GHT__) #include "../audio/drivers/ps3_audio.c" #elif defined(XENON) #include "../audio/drivers/xenon360_audio.c" @@ -1144,7 +1137,7 @@ FRONTEND #include "../frontend/drivers/platform_xdk.c" #endif -#if defined(__CELLOS_LV2__) +#if defined(__PSL1GHT__) #include "../frontend/drivers/platform_ps3.c" #elif defined(GEKKO) #include "../frontend/drivers/platform_gx.c" diff --git a/input/input_autodetect_builtin.c b/input/input_autodetect_builtin.c index 08f2615e25..812e3e4021 100644 --- a/input/input_autodetect_builtin.c +++ b/input/input_autodetect_builtin.c @@ -746,7 +746,7 @@ const char* const input_builtin_autoconfs[] = DECL_AUTOCONF_DEVICE("GameCube Controller", "wiiu", WIIUINPUT_GAMECUBE_DEFAULT_BINDS), DECL_AUTOCONF_DEVICE("Sony DualShock 3", "wiiu", WIIUINPUT_DS3_DEFAULT_BINDS), #endif -#ifdef __CELLOS_LV2__ +#ifdef __PSL1GHT__ DECL_AUTOCONF_DEVICE("SixAxis Controller", "ps3", PS3INPUT_DEFAULT_BINDS), #endif #if defined(__SWITCH__) || defined(SWITCH) diff --git a/input/input_driver.h b/input/input_driver.h index 577f94b4c4..d62e6dc3bb 100644 --- a/input/input_driver.h +++ b/input/input_driver.h @@ -233,7 +233,7 @@ struct rarch_joypad_driver #define DEFAULT_MAX_PADS 8 #elif defined(__QNX__) #define DEFAULT_MAX_PADS 8 -#elif defined(__CELLOS_LV2__) +#elif defined(__PSL1GHT__) #define DEFAULT_MAX_PADS 7 #elif defined(_XBOX) #define DEFAULT_MAX_PADS 4 diff --git a/libretro-common/features/features_cpu.c b/libretro-common/features/features_cpu.c index 0ad815e2a0..1a003284fd 100644 --- a/libretro-common/features/features_cpu.c +++ b/libretro-common/features/features_cpu.c @@ -43,11 +43,7 @@ #include #endif -#if defined(__CELLOS_LV2__) -#ifndef _PPU_INTRINSICS_H -#include -#endif -#elif defined(_XBOX360) +#if defined(_XBOX360) #include #elif defined(_POSIX_MONOTONIC_CLOCK) || defined(ANDROID) || defined(__QNX__) || defined(DJGPP) /* POSIX_MONOTONIC_CLOCK is not being defined in Android headers despite support being present. */ @@ -75,8 +71,6 @@ #if defined(__PSL1GHT__) #include -#elif defined(__CELLOS_LV2__) -#include #endif #ifdef GEKKO @@ -183,7 +177,7 @@ retro_perf_tick_t cpu_features_get_perf_counter(void) time_ticks = (retro_perf_tick_t)a | ((retro_perf_tick_t)d << 32); #elif defined(__ARM_ARCH_6__) __asm__ volatile( "mrc p15, 0, %0, c9, c13, 0" : "=r"(time_ticks) ); -#elif defined(__CELLOS_LV2__) || defined(_XBOX360) || defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__) || defined(__PSL1GHT__) +#elif defined(_XBOX360) || defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__) || defined(__PSL1GHT__) time_ticks = __mftb(); #elif defined(GEKKO) time_ticks = gettime(); @@ -226,8 +220,6 @@ retro_time_t cpu_features_get_time_usec(void) return (count.QuadPart / freq.QuadPart * 1000000) + (count.QuadPart % freq.QuadPart * 1000000 / freq.QuadPart); #elif defined(__PSL1GHT__) return sysGetSystemTime(); -#elif defined(__CELLOS_LV2__) - return sys_time_get_system_time(); #elif defined(GEKKO) return ticks_to_microsecs(gettime()); #elif defined(WIIU) @@ -492,7 +484,7 @@ unsigned cpu_features_get_core_amount(void) return sysinfo.dwNumberOfProcessors; #elif defined(GEKKO) return 1; -#elif defined(PSP) || defined(PS2) || defined(__CELLOS_LV2__) +#elif defined(PSP) || defined(PS2) return 1; #elif defined(VITA) return 4; diff --git a/libretro-common/file/config_file.c b/libretro-common/file/config_file.c index 4a8c89190d..c9bb71f0ac 100644 --- a/libretro-common/file/config_file.c +++ b/libretro-common/file/config_file.c @@ -26,7 +26,7 @@ #include #include -#if !defined(_WIN32) && !defined(__CELLOS_LV2__) && !defined(_XBOX) +#if !defined(_WIN32) && !defined(_XBOX) #include /* PATH_MAX */ #elif defined(_WIN32) && !defined(_XBOX) #define WIN32_LEAN_AND_MEAN @@ -330,7 +330,6 @@ static void config_file_get_realpath(char *s, size_t len, fill_pathname_resolve_relative(s, config_path, path, len); #else -#ifndef __CELLOS_LV2__ if (*path == '~') { const char *home = getenv("HOME"); @@ -343,7 +342,6 @@ static void config_file_get_realpath(char *s, size_t len, strlcpy(s, path + 1, len); } else -#endif if (!string_is_empty(config_path)) fill_pathname_resolve_relative(s, config_path, path, len); #endif diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c index 3dd53c987c..44ceb7249a 100644 --- a/libretro-common/file/file_path.c +++ b/libretro-common/file/file_path.c @@ -80,15 +80,11 @@ #include #endif -#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) -#include -#endif - #if defined(VITA) #define FIO_S_ISDIR SCE_S_ISDIR #endif -#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP) +#if defined(__QNX__) || defined(PSP) #include /* stat() is defined here */ #endif diff --git a/libretro-common/file/file_path_io.c b/libretro-common/file/file_path_io.c index 413228fab8..89485012b0 100644 --- a/libretro-common/file/file_path_io.c +++ b/libretro-common/file/file_path_io.c @@ -82,15 +82,11 @@ #include #endif -#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) -#include -#endif - #if defined(VITA) #define FIO_S_ISDIR SCE_S_ISDIR #endif -#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP) || defined(PS2) +#if defined(__QNX__) || defined(PSP) || defined(PS2) #include /* stat() is defined here */ #endif diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h index 18a2e55225..8a5da8648b 100644 --- a/libretro-common/include/libretro.h +++ b/libretro-common/include/libretro.h @@ -69,7 +69,7 @@ extern "C" { # endif # endif # else -# if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__CELLOS_LV2__) +# if defined(__GNUC__) && __GNUC__ >= 4 # define RETRO_API RETRO_CALLCONV __attribute__((__visibility__("default"))) # else # define RETRO_API RETRO_CALLCONV diff --git a/libretro-common/include/memmap.h b/libretro-common/include/memmap.h index 75a85f3666..ebbc3071eb 100644 --- a/libretro-common/include/memmap.h +++ b/libretro-common/include/memmap.h @@ -26,7 +26,7 @@ #include #include -#if defined(__CELLOS_LV2__) || defined(PSP) || defined(PS2) || defined(GEKKO) || defined(VITA) || defined(_XBOX) || defined(_3DS) || defined(WIIU) || defined(SWITCH) || defined(HAVE_LIBNX) +#if defined(PSP) || defined(PS2) || defined(GEKKO) || defined(VITA) || defined(_XBOX) || defined(_3DS) || defined(WIIU) || defined(SWITCH) || defined(HAVE_LIBNX) /* No mman available */ #elif defined(_WIN32) && !defined(_XBOX) #include diff --git a/libretro-common/include/net/net_compat.h b/libretro-common/include/net/net_compat.h index 2cf71f12d8..3a5c02ab00 100644 --- a/libretro-common/include/net/net_compat.h +++ b/libretro-common/include/net/net_compat.h @@ -116,19 +116,7 @@ struct SceNetInAddr inet_aton(const char *ip_addr); #include #include -#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) -#include -#include -#include -#include - -#ifndef EWOULDBLOCK -#define EWOULDBLOCK SYS_NET_EWOULDBLOCK -#endif - -#else #include -#endif #endif @@ -155,8 +143,6 @@ static INLINE bool isagain(int bytes) if (WSAGetLastError() != WSAEWOULDBLOCK) return false; return true; -#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) - return (sys_net_errno == SYS_NET_EWOULDBLOCK) || (sys_net_errno == SYS_NET_EAGAIN);//35 #elif defined(VITA) return (bytes<0 && (bytes == SCE_NET_ERROR_EAGAIN || bytes == SCE_NET_ERROR_EWOULDBLOCK)); #elif defined(WIIU) diff --git a/libretro-common/include/retro_miscellaneous.h b/libretro-common/include/retro_miscellaneous.h index 8154ce5e95..c4ee4c1685 100644 --- a/libretro-common/include/retro_miscellaneous.h +++ b/libretro-common/include/retro_miscellaneous.h @@ -43,10 +43,6 @@ #endif -#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) -#include -#endif - #include #ifdef _MSC_VER @@ -79,9 +75,7 @@ static INLINE bool bits_any_set(uint32_t* ptr, uint32_t count) } #ifndef PATH_MAX_LENGTH -#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) -#define PATH_MAX_LENGTH CELL_FS_MAX_FS_PATH_LENGTH -#elif defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(PS2) || defined(GEKKO)|| defined(WIIU) || defined(ORBIS) +#if defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(PS2) || defined(GEKKO)|| defined(WIIU) || defined(ORBIS) #define PATH_MAX_LENGTH 512 #else #define PATH_MAX_LENGTH 4096 diff --git a/libretro-common/include/retro_timers.h b/libretro-common/include/retro_timers.h index 99b7575bd5..61456d34f2 100644 --- a/libretro-common/include/retro_timers.h +++ b/libretro-common/include/retro_timers.h @@ -25,9 +25,7 @@ #include -#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) -#include -#elif defined(XENON) +#if defined(XENON) #include