From 88371392716f47cb1166cb260886a4eda5b587c9 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 15 Sep 2013 18:49:18 +0200 Subject: [PATCH] (360) Build fixes --- frontend/frontend.c | 2 +- frontend/menu/rmenu_xui.cpp | 7 +++---- frontend/platform/platform_xdk.c | 2 +- gfx/shader_hlsl.c | 4 +++- xdk/xdk_d3d.cpp | 8 ++++---- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/frontend/frontend.c b/frontend/frontend.c index 4102b07fbb..1371965985 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -23,7 +23,7 @@ frontend_ctx_driver_t *frontend_ctx; #if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI) #define HAVE_MENU -#include "frontend/menu/menu_common.h" +#include "menu/menu_common.h" #else #undef HAVE_MENU #endif diff --git a/frontend/menu/rmenu_xui.cpp b/frontend/menu/rmenu_xui.cpp index 815d7ca2fa..a5c2834b7f 100644 --- a/frontend/menu/rmenu_xui.cpp +++ b/frontend/menu/rmenu_xui.cpp @@ -1222,10 +1222,9 @@ HRESULT CRetroArchCoreBrowser::OnNotifyPress( HXUIOBJ hObjPressed, BOOL& bHandle wcstombs(str_buffer, (const wchar_t *)XuiListGetText(m_menulist, index), sizeof(str_buffer)); if(path_file_exists(rgui->browser->list->elems[index].data)) { - struct retro_variable var; - var.key = "core_path"; - snprintf(var.value, sizeof(var.value), "%s\\%s", rgui->browser->current_dir.directory_path, str_buffer); - rarch_environment_cb(RETRO_ENVIRONMENT_SET_LIBRETRO_PATH, &var); + char path[256]; + snprintf(path, sizeof(path), "%s\\%s", rgui->browser->current_dir.directory_path, str_buffer); + rarch_environment_cb(RETRO_ENVIRONMENT_SET_LIBRETRO_PATH, (void*)path); g_extern.lifecycle_mode_state |= (1ULL << MODE_EXITSPAWN); process_input_ret = -1; diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c index a2097c3301..4e97d2e77b 100644 --- a/frontend/platform/platform_xdk.c +++ b/frontend/platform/platform_xdk.c @@ -181,7 +181,7 @@ static HRESULT xbox_io_unmount(char *szDrive) } #endif -static void get_environment_settings(int argc, char *argv[]) +static void get_environment_settings(int argc, char *argv[], void *args) { HRESULT ret; (void)ret; diff --git a/gfx/shader_hlsl.c b/gfx/shader_hlsl.c index ccf0f2db95..366777442c 100644 --- a/gfx/shader_hlsl.c +++ b/gfx/shader_hlsl.c @@ -431,9 +431,11 @@ const gl_shader_backend_t hlsl_backend = { hlsl_use, hlsl_num, hlsl_filter_type, + NULL, /* hlsl_wrap_type */ hlsl_shader_scale, - NULL, /* hlsl_set_coords */ + NULL, /* hlsl_set_coords */ hlsl_set_mvp, + NULL, /* hlsl_get_prev_textures */ RARCH_SHADER_HLSL, }; diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp index 8a806416d0..a1ea19fe51 100644 --- a/xdk/xdk_d3d.cpp +++ b/xdk/xdk_d3d.cpp @@ -567,9 +567,9 @@ static void *xdk_d3d_init(const video_info_t *video, const input_driver_t **inpu d3d->tex_h = RARCH_SCALE_BASE * video->input_scale; #if defined(_XBOX1) - d3d->ctx_driver = gfx_ctx_init_first(GFX_CTX_DIRECT3D8_API); + d3d->ctx_driver = gfx_ctx_init_first(GFX_CTX_DIRECT3D8_API, 8, 0); #elif defined(_XBOX360) - d3d->ctx_driver = gfx_ctx_init_first(GFX_CTX_DIRECT3D9_API); + d3d->ctx_driver = gfx_ctx_init_first(GFX_CTX_DIRECT3D9_API, 9, 0); #endif if (d3d->ctx_driver) { @@ -1039,8 +1039,8 @@ static bool xdk_d3d_alive(void *data) static bool xdk_d3d_focus(void *data) { - (void)data; - return gfx_ctx_window_has_focus(); + xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data; + return d3d->ctx_driver->has_focus(); } static void xdk_d3d_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)