Permalink
Browse files

(XDK1) Fix build

  • Loading branch information...
1 parent d929ef9 commit 119ee6d53857a1d26d43102e9650dc95c4e9c335 @twinaphex twinaphex committed Jul 15, 2013
Showing with 11 additions and 5 deletions.
  1. +2 −2 core_info.c
  2. +6 −2 gfx/context/xdk_ctx.c
  3. +3 −1 xdk/xdk_d3d.cpp
View
@@ -25,15 +25,15 @@ core_info_list_t *get_core_info_list(const char *modules_path)
core_info_t *core_info;
core_info_list_t *core_info_list;
- int i;
+ unsigned i;
if (!contents)
return NULL;
core_info = (core_info_t*)malloc(contents->size * sizeof(core_info_t));
memset(core_info, 0, contents->size * sizeof(core_info_t));
- core_info_list = malloc(sizeof(core_info_list_t));
+ core_info_list = (core_info_list_t*)malloc(sizeof(core_info_list_t));
memset(core_info_list, 0, sizeof(core_info_list_t));
core_info_list->list = core_info;
core_info_list->count = contents->size;
View
@@ -77,6 +77,10 @@ static bool gfx_ctx_xdk_window_has_focus(void)
return true;
}
+#ifdef _XBOX1
+extern unsigned font_x, font_y;
+#endif
+
static void gfx_ctx_xdk_update_window_title(void)
{
char buf[128];
@@ -85,15 +89,15 @@ static void gfx_ctx_xdk_update_window_title(void)
if (gfx_get_fps(buf, sizeof(buf), false) &&
g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW))
{
+ MEMORYSTATUS stat;
+ font_params_t font_parms = {0};
#if defined(_XBOX1)
float mem_width = font_x + 30;
float mem_height = font_y + 50;
#elif defined(_XBOX360)
float mem_width = (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_HD)) ? 160 : 100;
float mem_height = 70;
#endif
- MEMORYSTATUS stat;
- font_params_t font_parms = {0};
GlobalMemoryStatus(&stat);
View
@@ -1001,14 +1001,16 @@ NULL, NULL, NULL, 0);
float msg_height = 120;
#endif
+#if 0
if (msg)
{
font_parms.x = msg_width;
font_parms.y = msg_height;
d3d->font_ctx->render_msg(d3d, msg, &font_parms);
}
+#endif
- context_update_window_title_func();
+ d3d->ctx_driver->update_window_title();
gfx_ctx_xdk_swap_buffers();

0 comments on commit 119ee6d

Please sign in to comment.