mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-25 03:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Xbox 1) Make xdk_ctx independent of HAVE_RMENU

Browse Source
This commit is contained in:
twinaphex 2013-03-10 16:29:08 +01:00
parent 5bc9402fed
commit ae9ddf362b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/menu/rmenu.c
View File

@ -193,6 +193,10 @@ static const char *menu_drive_mapping_next(void)
#define CURRENT_PATH_Y_POSITION (m_menuMainRomListPos_y - ((POSITION_Y_INCREMENT/2))) #define CURRENT_PATH_Y_POSITION (m_menuMainRomListPos_y - ((POSITION_Y_INCREMENT/2)))
#define CURRENT_PATH_FONT_SIZE 21 #define CURRENT_PATH_FONT_SIZE 21
#define FONT_SIZE 21
#define NUM_ENTRY_PER_PAGE 12
#elif defined(__CELLOS_LV2__) #elif defined(__CELLOS_LV2__)
#define HARDCODE_FONT_SIZE 0.91f #define HARDCODE_FONT_SIZE 0.91f
#define POSITION_X 0.09f #define POSITION_X 0.09f

12
gfx/context/xdk_ctx.c
View File

@ -45,10 +45,6 @@
#define ROM_PANEL_WIDTH 510 #define ROM_PANEL_WIDTH 510
#define ROM_PANEL_HEIGHT 20 #define ROM_PANEL_HEIGHT 20
#define FONT_SIZE 21
#define NUM_ENTRY_PER_PAGE 12
int xpos, ypos; int xpos, ypos;
#ifdef _XBOX1 #ifdef _XBOX1
// Rom list coordinates // Rom list coordinates
@ -90,7 +86,7 @@ static void gfx_ctx_xdk_set_resize(unsigned width, unsigned height) { }
static bool gfx_ctx_xdk_menu_init(void) static bool gfx_ctx_xdk_menu_init(void)
{ {
#ifdef _XBOX1 #if defined(_XBOX1) && defined(HAVE_RMENU)
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data; xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data;
int width = d3d->win_width; int width = d3d->win_width;
@ -134,7 +130,7 @@ static void gfx_ctx_xdk_menu_frame(void* data)
static void gfx_ctx_xdk_menu_free(void) static void gfx_ctx_xdk_menu_free(void)
{ {
#ifdef _XBOX1 #if defined(_XBOX1) && defined(HAVE_RMENU)
texture_image_free(&g_extern.console.menu_texture); texture_image_free(&g_extern.console.menu_texture);
texture_image_free(&g_extern.console.menu_panel); texture_image_free(&g_extern.console.menu_panel);
#endif #endif
@ -157,7 +153,7 @@ static bool gfx_ctx_xdk_window_has_focus(void)
static void gfx_ctx_xdk_menu_draw_bg(rarch_position_t *position) static void gfx_ctx_xdk_menu_draw_bg(rarch_position_t *position)
{ {
#ifdef _XBOX1 #if defined(_XBOX1) && defined(HAVE_RMENU)
g_extern.console.menu_texture.x = 0; g_extern.console.menu_texture.x = 0;
g_extern.console.menu_texture.y = 0; g_extern.console.menu_texture.y = 0;
texture_image_render(&g_extern.console.menu_texture); texture_image_render(&g_extern.console.menu_texture);
@ -166,7 +162,7 @@ static void gfx_ctx_xdk_menu_draw_bg(rarch_position_t *position)
static void gfx_ctx_xdk_menu_draw_panel(rarch_position_t *position) static void gfx_ctx_xdk_menu_draw_panel(rarch_position_t *position)
{ {
#ifdef _XBOX1 #if defined(_XBOX1) && defined(HAVE_RMENU)
g_extern.console.menu_panel.x = position->x; g_extern.console.menu_panel.x = position->x;
g_extern.console.menu_panel.y = position->y; g_extern.console.menu_panel.y = position->y;
g_extern.console.menu_panel.width = ROM_PANEL_WIDTH; g_extern.console.menu_panel.width = ROM_PANEL_WIDTH;