libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-21 18:21:51 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(GX) Compile fixes -haven't tested yet

Browse Source
This commit is contained in:
twinaphex 2012-12-15 05:55:08 +01:00
parent 89e493ed15
commit 7685009f56
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.wii
View File

@ -57,7 +57,7 @@ CFLAGS += -DHAVE_FILE_LOGGER
CFLAGS += -Iconsole/logger
endif
CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_RGUI -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DHAVE_CONFIGFILE=1 -DGEKKO -DHAVE_ZLIB -DWANT_RZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DPACKAGE_VERSION=\"0.9.8-beta3\" -Dmain=rarch_main -Wno-char-subscripts
CFLAGS += -std=gnu99 -DHAVE_DEFAULT_RETROPAD_INPUT -DHAVE_RGUI -DHAVE_THREAD -DRARCH_CONSOLE -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RARCH_EXEC -DHAVE_RMENU -DHAVE_CONFIGFILE=1 -DGEKKO -DHAVE_ZLIB -DWANT_RZLIB -DHAVE_RARCH_MAIN_WRAP -DHAVE_GRIFFIN=1 -DHAVE_SCREENSHOTS -DPACKAGE_VERSION=\"0.9.8-beta3\" -Dmain=rarch_main -Wno-char-subscripts
ifeq ($(DEBUG), 1)
CFLAGS += -O0 -g -DDEBUG

2
general.h
View File

@ -572,9 +572,7 @@ struct global
#endif
} console;
#if defined(ANDROID) || defined(HAVE_RMENU)
uint64_t lifecycle_state;
#endif
struct
{

10
gx/frontend/main.c
View File

@ -286,6 +286,8 @@ static void menu_loop(void)
do
{
g_extern.frame_count++;
uint16_t input_state = 0;
input_gx.poll(NULL);
@ -304,10 +306,10 @@ static void menu_loop(void)
if(!first_held)
{
first_held = true;
SET_TIMER_EXPIRATION(gx, 1, (initial_held) ? 15 : 7);
SET_TIMER_EXPIRATION(1, (initial_held) ? 15 : 7);
}
if(IS_TIMER_EXPIRED(gx, 1))
if(IS_TIMER_EXPIRED(1))
{
first_held = false;
trigger_state = input_state; //second input frame set as current frame
@ -357,7 +359,7 @@ static void menu_loop(void)
bool goto_menu_key_pressed = (trigger_state & (1 << GX_DEVICE_NAV_MENU));
bool quit_key_pressed = (trigger_state & (1 << GX_DEVICE_NAV_QUIT));
if(IS_TIMER_EXPIRED(gx, 0))
if(IS_TIMER_EXPIRED(0))
{
// if we want to force goto the emulation loop, skip this
if(g_extern.console.rmenu.mode != MODE_EMULATION)
@ -380,7 +382,7 @@ static void menu_loop(void)
// press and holding QUIT in the emulation loop (lasts for 30 frame ticks)
if(g_extern.console.rmenu.mode == MODE_EMULATION)
{
SET_TIMER_EXPIRATION(gx, 0, 30);
SET_TIMER_EXPIRATION(0, 30);
}
}while(g_extern.console.rmenu.state.rmenu.enable);

2
gx/gx_input.c
View File

@ -459,8 +459,6 @@ static bool gx_input_key_pressed(void *data, int key)
{
(void)data;
gx_video_t *gx = driver.video_data;
switch (key)
{
case RARCH_QUIT_KEY: