diff --git a/Makefile.psl1ght b/Makefile.psl1ght index 9a1ebf92eb..b073c10a01 100644 --- a/Makefile.psl1ght +++ b/Makefile.psl1ght @@ -26,8 +26,6 @@ LIBS := -lretro_psl1ght -laudio -lEGL -lGL -lio -lm -ljpgdec -lpngdec -lsysutil OBJ = console/griffin/griffin.o console/rzlib/rzlib.o -OBJ += console/rgl/ps3/device_ctx.o console/rgl/ps3/rgl.o console/rgl/ps3/cgbio.o console/rgl/ps3/cgnv2rt.o - ifeq ($(HAVE_LOGGER), 1) CFLAGS += -DHAVE_LOGGER CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c index 6c3db4a424..ce319b3f32 100644 --- a/console/griffin/griffin.c +++ b/console/griffin/griffin.c @@ -276,6 +276,8 @@ MAIN #include "../../xdk/frontend/main.c" #elif defined(GEKKO) #include "../../gx/frontend/main.c" +#elif defined(__PSL1GHT__) +#include "../../ps3/frontend/main.c" #endif /*============================================================ diff --git a/file_path.c b/file_path.c index ee8b06598c..8fe2d99628 100644 --- a/file_path.c +++ b/file_path.c @@ -22,7 +22,7 @@ #include "compat/strl.h" #include "compat/posix_string.h" -#ifdef __CELLOS_LV2__ +#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) #include //stat() is defined here #define S_ISDIR(x) (x & CELL_FS_S_IFDIR) #endif diff --git a/ps3/frontend/main.c b/ps3/frontend/main.c index 26b22672a1..dd52c1e2f7 100644 --- a/ps3/frontend/main.c +++ b/ps3/frontend/main.c @@ -19,7 +19,9 @@ #include #include +#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) #include +#endif #include #ifdef HAVE_SYSUTILS #include @@ -37,9 +39,11 @@ #ifdef HAVE_SYSMODULES #include #endif +#ifdef HAVE_NETPLAY #include #include #include +#endif #include "../../gfx/context/ps3_ctx.h" #include "../ps3_input.h" @@ -205,9 +209,11 @@ static void get_environment_settings(int argc, char *argv[]) snprintf(default_paths.cgp_dir, sizeof(default_paths.cgp_dir), "%s/presets", default_paths.core_dir); snprintf(default_paths.input_presets_dir, sizeof(default_paths.input_presets_dir), "%s/input", default_paths.cgp_dir); snprintf(default_paths.border_dir, sizeof(default_paths.border_dir), "%s/borders", default_paths.core_dir); +#if defined(HAVE_CG) || defined(HAVE_GLSL) snprintf(default_paths.shader_dir, sizeof(default_paths.shader_dir), "%s/shaders", default_paths.core_dir); snprintf(default_paths.shader_file, sizeof(default_paths.shader_file), "%s/shaders/stock.cg", default_paths.core_dir); snprintf(default_paths.menu_shader_file, sizeof(default_paths.menu_shader_file), "%s/shaders/Borders/Menu/border-only-rarch.cg", default_paths.core_dir); +#endif snprintf(default_paths.config_file, sizeof(default_paths.config_file), "%s/retroarch.cfg", default_paths.port_dir); snprintf(default_paths.salamander_file, sizeof(default_paths.salamander_file), "EBOOT.BIN"); } diff --git a/ps3/sdk_defines.h b/ps3/sdk_defines.h index adf395b041..cce5665313 100644 --- a/ps3/sdk_defines.h +++ b/ps3/sdk_defines.h @@ -537,3 +537,12 @@ (((order)<<16)|((inputA))|((inputR)<<2)|((inputG)<<4)|((inputB)<<6)|((outputA)<<8)|((outputR)<<10)|((outputG)<<12)|((outputB)<<14)) #endif + +#ifdef __PSL1GHT__ +#include +#define CellGameContentSize sysGameContentSize +#define cellGameContentPermit sysGameContentPermit +#define cellGameBootCheck sysGameBootCheck + +#define CELL_GAME_ATTRIBUTE_APP_HOME (1 <<1) /* boot from / app_home/PS3_GAME */ +#endif