diff --git a/Makefile.ps3 b/Makefile.ps3 index 2508488811..c36bbebf61 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -58,7 +58,7 @@ PYTHON2 = python2.exe GIT = git.exe endif -PPU_SRCS = ps3/frontend/main.c +PPU_SRCS = console/griffin/griffin.c console/rzlib/rzlib.c ifeq ($(PERF_TEST), 1) DEFINES += -DPERF_TEST @@ -92,9 +92,11 @@ ifneq($(system_platform), win) endif -PPU_LDLIBS = $(FONT_LIBS) $(GL_LIBS) -lretroarch_ps3 -lretro_ps3 -lcgc -lgcm_cmd -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_LDLIBS = $(FONT_LIBS) $(GL_LIBS) -lretro_ps3 -lcgc -lgcm_cmd -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 -DEFINES += -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_PSGL -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FILEBROWSER -DHAVE_HDD_CACHE_PARTITION -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) +PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe + +DEFINES += -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_RMENU -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_PSGL -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES -DHAVE_OPENGLES1 -DHAVE_PSGL -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FILEBROWSER -DHAVE_HDD_CACHE_PARTITION -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) ifeq ($(DEBUG), 1) PPU_OPTIMIZE_LV := -O0 -g @@ -111,7 +113,6 @@ 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)) diff --git a/Makefile.ps3.retroarch b/Makefile.ps3.retroarch deleted file mode 100644 index 47cac4e9df..0000000000 --- a/Makefile.ps3.retroarch +++ /dev/null @@ -1,84 +0,0 @@ -RARCH_VERSION = "0.9.8-beta2" - -#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 = ultra-opt - -DEBUG = 0 -HAVE_RGL = 1 -HAVE_LOGGER = 0 -HAVE_FREETYPE = 0 -PERF_TEST = 0 - -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 - -# 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 ($(PERF_TEST), 1) - DEFINES += -DPERF_TEST -endif - -PPU_LIB_TARGET = libretroarch_ps3.a - -LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -INCDIRS = -I. -Ips3 -Icommon - -PPU_SRCS = console/griffin/griffin.c console/rzlib/rzlib.c - -ifeq ($(HAVE_RGL), 1) -DEFINES += -DHAVE_RGL -endif - -ifeq ($(HAVE_FREETYPE), 1) -DEFINES += -DHAVE_FREETYPE -else -DEFINES += -DHAVE_LIBDBGFONT -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 - SNC_PPU_AR = $(CELL_SDK)/host-win32/sn/bin/ps3snarl.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_AR = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ar.exe -endif - -PPU_RANLIB = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ranlib.exe - -DEFINES += -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_RMENU -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_PSGL -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES1 -DHAVE_CG -DHAVE_CG_RUNTIME_COMPILER -DHAVE_FILEBROWSER -DHAVE_HDD_CACHE_PARTITION -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_OSKUTIL -DHAVE_MOUSE -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) - -ifeq ($(DEBUG), 1) - PPU_OPTIMIZE_LV := -O0 -g -else - PPU_OPTIMIZE_LV := -O3 -g -endif - -PPU_CFLAGS = $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES) -PPU_CXXFLAGS = $(PPU_OPTIMIZE_LV) $(INCDIRS) $(DEFINES) - -ifeq ($(HAVE_LOGGER), 1) -PPU_CFLAGS += -DHAVE_LOGGER -PPU_SRCS += console/logger/logger.c -endif - -include $(CELL_MK_DIR)/sdk.target.mk diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index 44f5fdc6fc..9f97f4d75c 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -311,7 +311,7 @@ MAIN #include "../../xdk/frontend/main.c" #elif defined(GEKKO) #include "../../gx/frontend/main.c" -#elif defined(__PSL1GHT__) +#elif defined(__CELLOS_LV2__) #include "../../ps3/frontend/main.c" #elif defined(ANDROID) #include "../../android/native/jni/main.c"