mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-27 03:35:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Added HAVE_SCREENSHOTS_BUILTIN define - is meant for targets

Browse Source 
where native screenshot functionality is already supplied, negating
the need of compiling in screenshot.c
This commit is contained in:
TwinAphex51224 2012-01-26 03:00:56 +01:00 committed by Themaister
parent 7af7d55068
commit be62e537c6
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.ps3
View File

@ -43,11 +43,11 @@ INCDIRS = -I. -Icommon
MAKE_FSELF_NPDRM = $(CELL_SDK)/$(HOST_DIR)/bin/make_fself_npdrm
MAKE_PACKAGE_NPDRM = $(CELL_SDK)/$(HOST_DIR)/bin/make_package_npdrm
OBJ = fifo_buffer.o ps3/cellframework2/fileio/file_browser.o ps3/ps3_audio.o ps3/menu.o console/rom_ext.o ps3/ps3_input.o ps3/cellframework2/input/pad_input.o getopt.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o netplay.o netplay_compat.o gfx/gfx_common.o ps3/ps3_video_psgl.o gfx/shader_cg.o gfx/snes_state.o ups.o bps.o strl.o screenshot.o audio/hermite.o dynamic.o ps3/main.o audio/utils.o conf/config_file.o ps3/image.o
OBJ = fifo_buffer.o ps3/cellframework2/fileio/file_browser.o ps3/ps3_audio.o ps3/menu.o console/rom_ext.o ps3/ps3_input.o ps3/cellframework2/input/pad_input.o getopt.o ssnes.o driver.o file.o settings.o message.o rewind.o movie.o netplay.o netplay_compat.o gfx/gfx_common.o ps3/ps3_video_psgl.o gfx/shader_cg.o gfx/snes_state.o ups.o bps.o strl.o audio/hermite.o dynamic.o ps3/main.o audio/utils.o conf/config_file.o ps3/image.o
LIBS = -ldbgfont -lPSGL -lPSGLcgc -lcgc -lgcm_cmd -lgcm_sys_stub -lsnes -lresc_stub -lm -lio_stub -lfs_stub -lsysutil_stub -lsysutil_game_stub -lsysutil_screenshot_stub -lpngdec_stub -ljpgdec_stub -lsysmodule_stub -laudio_stub -lnet_stub -lpthread
DEFINES = -DSSNES_CONSOLE -DHAVE_OPENGL=1 -DHAVE_CG=1 -DHAVE_FBO=1 -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPACKAGE_VERSION=\"0.9.4.1\" -Dmain=ssnes_main
DEFINES = -DSSNES_CONSOLE -DHAVE_OPENGL=1 -DHAVE_CG=1 -DHAVE_FBO=1 -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DPACKAGE_VERSION=\"0.9.4.1\" -DHAVE_SCREENSHOTS_BUILTIN=1 -Dmain=ssnes_main
ifeq ($(DEBUG), 1)
PPU_OPTIMIZE_LV := -O0 -g

3
ps3/menu.c
View File

@ -1360,7 +1360,8 @@ void menu_loop(void)
do
{
glClear(GL_COLOR_BUFFER_BIT);
gl_frame_menu();
//gl_frame_menu();
g_frame_count++;
switch(menuStack[menuStackindex].enum_id)
{

2
ps3/ps3_video_psgl.c
View File

@ -1187,7 +1187,7 @@ void ps3_video_init(void)
get_all_available_resolutions();
ps3_set_resolution();
ps3_setup_texture();
//ps3_setup_texture();
}
void ps3_video_deinit(void)

6
ssnes.c
View File

@ -95,6 +95,7 @@ static inline unsigned lines_to_pitch(unsigned height)
return g_extern.system.pitch;
}
#ifndef HAVE_SCREENSHOTS_BUILTIN
static void take_screenshot(void)
{
if (!(*g_settings.screenshot_directory))
@ -134,6 +135,7 @@ static void take_screenshot(void)
else
msg_queue_push(g_extern.msg_queue, msg, 1, 180);
}
#endif
static inline void adjust_crop(const uint16_t **data, unsigned *height)
@ -1931,6 +1933,7 @@ static void check_cheats(void)
}
#endif
#ifndef HAVE_SCREENSHOTS_BUILTIN
static void check_screenshot(void)
{
static bool old_pressed = false;
@ -1940,6 +1943,7 @@ static void check_screenshot(void)
old_pressed = pressed;
}
#endif
#ifdef HAVE_DYLIB
static void check_dsp_config(void)
@ -1991,7 +1995,9 @@ static void check_netplay_flip(void)
static void do_state_checks(void)
{
#ifndef HAVE_SCREENSHOTS_BUILTIN
check_screenshot();
#endif
check_mute();
#ifdef HAVE_NETPLAY