diff --git a/360/frontend-xdk/main.c b/360/frontend-xdk/main.c index ae953d5c51..c318449d12 100644 --- a/360/frontend-xdk/main.c +++ b/360/frontend-xdk/main.c @@ -246,19 +246,32 @@ static void get_environment_settings (void) #endif strlcpy(DEFAULT_SHADER_FILE, "game:\\media\\shaders\\stock.cg", sizeof(DEFAULT_SHADER_FILE)); +#ifdef _XBOX1 + /* FIXME: Hardcoded */ + strlcpy(SYS_CONFIG_FILE, "D:\\retroarch.cfg", sizeof(SYS_CONFIG_FILE)); +#else strlcpy(SYS_CONFIG_FILE, "game:\\retroarch.cfg", sizeof(SYS_CONFIG_FILE)); +#endif } static void configure_libretro(const char * extension) { char full_path[1024]; +#ifdef _XBOX1 + snprintf(full_path, sizeof(full_path), "D:\\CORE%s", extension); +#else snprintf(full_path, sizeof(full_path), "game:\\CORE%s", extension); +#endif bool find_libretro_file = rarch_configure_libretro_core(full_path, "game:\\", "game:\\", SYS_CONFIG_FILE, extension); set_default_settings(); +#ifdef _XBOX1 + rarch_config_load(SYS_CONFIG_FILE, "D:\\", extension, find_libretro_file); +#else rarch_config_load(SYS_CONFIG_FILE, "game:\\", extension, find_libretro_file); +#endif init_libretro_sym(); } @@ -321,5 +334,4 @@ begin_shutdown: rarch_exec(); return 0; -} - +} \ No newline at end of file diff --git a/console/retroarch_console.c b/console/retroarch_console.c index 6f81f276c9..8f268683a6 100644 --- a/console/retroarch_console.c +++ b/console/retroarch_console.c @@ -923,6 +923,8 @@ 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 75f3073a6d..866b366f9d 100644 --- a/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj +++ b/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj @@ -4,6 +4,7 @@ Version="7.10" Name="RetroArch" ProjectGUID="{0E616FC4-0954-4FE3-935C-B7383B18D325}" + RootNamespace="RetroArch" Keyword="XboxProj">