From 072abdb8bf965dc094677e26c21c8703a92bb561 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 8 Jul 2012 17:25:33 +0300 Subject: [PATCH] (Xbox 1) Libretro management code works now - have to debug xdk_d3d_init now --- 360/frontend-xdk/main.c | 6 ++++++ 360/xdk_d3d.cpp | 2 ++ console/retroarch_console.c | 2 -- msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj | 15 ++++++++++----- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/360/frontend-xdk/main.c b/360/frontend-xdk/main.c index c318449d12..80bed8c67f 100644 --- a/360/frontend-xdk/main.c +++ b/360/frontend-xdk/main.c @@ -263,8 +263,13 @@ static void configure_libretro(const char * extension) snprintf(full_path, sizeof(full_path), "game:\\CORE%s", extension); #endif +#ifdef _XBOX1 + bool find_libretro_file = rarch_configure_libretro_core(full_path, "D:\\", "D:\\", + SYS_CONFIG_FILE, extension); +#else bool find_libretro_file = rarch_configure_libretro_core(full_path, "game:\\", "game:\\", SYS_CONFIG_FILE, extension); +#endif set_default_settings(); #ifdef _XBOX1 @@ -301,6 +306,7 @@ int main(int argc, char *argv[]) menu_init(); + begin_loop: if(g_console.mode_switch == MODE_EMULATION) { diff --git a/360/xdk_d3d.cpp b/360/xdk_d3d.cpp index eb6b269708..8fe2c1266a 100644 --- a/360/xdk_d3d.cpp +++ b/360/xdk_d3d.cpp @@ -218,8 +218,10 @@ static void xdk_d3d_init_fbo(xdk_d3d_video_t *d3d) static void *xdk_d3d_init(const video_info_t *video, const input_driver_t **input, void **input_data) { +#ifndef _XBOX1 if (driver.video_data) return driver.video_data; +#endif xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)calloc(1, sizeof(xdk_d3d_video_t)); if (!d3d) diff --git a/console/retroarch_console.c b/console/retroarch_console.c index 8f268683a6..6f81f276c9 100644 --- a/console/retroarch_console.c +++ b/console/retroarch_console.c @@ -923,8 +923,6 @@ void rarch_config_load(const char * conf_name, const char * libretro_dir_path, c // g_extern CONFIG_GET_INT_EXTERN(state_slot, "state_slot"); CONFIG_GET_INT_EXTERN(audio_data.mute, "audio_mute"); - - config_file_free(conf); } } diff --git a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj index 866b366f9d..0cdcb940ca 100644 --- a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj +++ b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj @@ -50,7 +50,8 @@ + Name="XboxDeploymentTool" + RemotePath="xe:\$(SolutionName)\CORE.xbe"/> + Name="XboxDeploymentTool" + RemotePath="xe:\$(SolutionName)\CORE.xbe"/> + Name="XboxDeploymentTool" + RemotePath="xe:\$(SolutionName)\CORE.xbe"/> + Name="XboxDeploymentTool" + RemotePath="xe:\$(SolutionName)\CORE.xbe"/> @@ -254,7 +258,8 @@ + Name="XboxDeploymentTool" + RemotePath="xe:\$(SolutionName)\CORE.xbe"/>