libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(RMenu XUI) Use menu_common

Browse Source
This commit is contained in:
twinaphex 2013-04-18 15:04:09 +02:00
parent 7c4b730e51
commit a2fc2b1e4f
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/menu/rmenu_xui.cpp
View File

@ -1282,10 +1282,12 @@ HRESULT CRetroArchMain::OnNotifyPress( HXUIOBJ hObjPressed, int & bHandled )
return 0;
}
void menu_init (void)
rgui_handle_t *rgui_init (void)
{
HRESULT hr;
rgui_handle_t *rgui = (rgui_handle_t*)calloc(1, sizeof(*rgui));
xdk_d3d_video_t *device_ptr = (xdk_d3d_video_t*)driver.video_data;
bool hdmenus_allowed = (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD));
@ -1355,9 +1357,11 @@ void menu_init (void)
if (driver.video_poke && driver.video_poke->set_texture_enable)
driver.video_poke->set_texture_frame(driver.video_data, NULL,
true, 0, 0, 1.0f);
return rgui;
}
void menu_free (void)
void rgui_free (rgui_handle_t *rgui)
{
filebrowser_free(browser);
app.Uninit();

2
frontend/menu/rmenu_xui.h
View File

@ -17,6 +17,8 @@
#ifndef _RMENU_XUI_H_
#define _RMENU_XUI_H_
#include "menu_common.h"
enum
{
SETTING_EMU_REWIND_ENABLED = 0,

16
griffin/griffin.c
View File

@ -18,6 +18,10 @@
#include "../msvc/msvc_compat.h"
#endif
#if defined(HAVE_RMENU) || defined(HAVE_RGUI) || defined(HAVE_RMENU_XUI)
#define HAVE_MENU
#endif
/*============================================================
CONSOLE EXTENSIONS
============================================================ */
@ -439,21 +443,17 @@ SCREENSHOTS
/*============================================================
MENU
============================================================ */
#if defined(HAVE_RMENU) || defined(HAVE_RGUI) || defined(HAVE_RMENU_XUI)
#ifdef HAVE_MENU
#include "../frontend/menu/menu_common.c"
#endif
#if defined(HAVE_RMENU_GUI)
#include "../frontend/menu/rmenu.c"
#endif
#ifdef HAVE_RGUI
#elif defined(HAVE_RGUI)
#include "../frontend/menu/rgui.c"
#endif
#if defined(HAVE_RMENU_XUI)
#elif defined(HAVE_RMENU_XUI)
#include "../frontend/menu/rmenu_xui.cpp"
#endif
#endif
#ifdef __cplusplus
extern "C" {