mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Small cleanups to RetroArch Salamander

Browse Source
This commit is contained in:
Twinaphex 2012-05-07 19:45:13 +02:00
parent b198fd1237
commit be5695f802
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.ps3.salamander
View File

@ -1,21 +1,10 @@
CELL_BUILD_TOOLS = SNC CELL_BUILD_TOOLS = SNC
CELL_SDK ?= /usr/local/cell CELL_SDK ?= /usr/local/cell
CELL_GPU_TYPE = RSX
CELL_PSGL_VERSION = opt
HAVE_LOGGER = 0 HAVE_LOGGER = 0
CELL_MK_DIR ?= $(CELL_SDK)/samples/mk
include $(CELL_MK_DIR)/sdk.makedef.mk include $(CELL_MK_DIR)/sdk.makedef.mk
MAKE_SELF_WC = make_self_wc
MAKE_SELF = make_self_npdrm
PKG_SCRIPT = ps3/ps3py/pkg.py
PKG_FINALIZE = package_finalize
STRIP = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe STRIP = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
COPY = cp
MOVE = mv
PPU_CFLAGS += -I. -D__CELLOS_LV2__ PPU_CFLAGS += -I. -D__CELLOS_LV2__
PPU_SRCS = console/salamander/main.c file_path.c compat/compat.c conf/config_file.c PPU_SRCS = console/salamander/main.c file_path.c compat/compat.c conf/config_file.c
@ -39,12 +28,8 @@ else
PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe PPU_CXXLD = $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-ld.exe
endif endif
PPU_LDLIBS += -lpthread -lm -lnet_stub -lnetctl_stub -lm -ldbgfont_gcm -lgcm_cmd -lgcm_sys_stub -lio_stub -lsysmodule_stub -lsysutil_stub -lsysutil_game_stub -lfs_stub -lsysutil_np_stub PPU_LDLIBS += -lm -lnet_stub -lnetctl_stub -lio_stub -lsysmodule_stub -lsysutil_stub -lsysutil_game_stub -lfs_stub -lsysutil_np_stub
PPU_OPTIMIZE_LV := -O2 PPU_OPTIMIZE_LV := -O2
include $(CELL_MK_DIR)/sdk.target.mk 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

12
console/salamander/main.c
View File

@ -287,6 +287,16 @@ static void get_environment_settings (void)
#endif #endif
} }
#ifdef __CELLOS_LV2__
//dummy - just to avoid the emitted warnings
static void callback_sysutil_exit(uint64_t status, uint64_t param, void *userdata)
{
(void) param;
(void) userdata;
(void) status;
}
#endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int ret; int ret;
@ -316,6 +326,8 @@ int main(int argc, char *argv[])
char spawn_data[256], spawn_data_size[16]; char spawn_data[256], spawn_data_size[16];
SceNpDrmKey * k_licensee = NULL; SceNpDrmKey * k_licensee = NULL;
cellSysutilRegisterCallback(0, callback_sysutil_exit, NULL);
cellSysmoduleLoadModule(CELL_SYSMODULE_IO); cellSysmoduleLoadModule(CELL_SYSMODULE_IO);
cellSysmoduleLoadModule(CELL_SYSMODULE_FS); cellSysmoduleLoadModule(CELL_SYSMODULE_FS);
cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_GAME); cellSysmoduleLoadModule(CELL_SYSMODULE_SYSUTIL_GAME);