CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-14 06:18:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(360) set_first_file fixed - Salamander is called default.xex now

Browse Source
This commit is contained in:
twinaphex 2012-08-22 18:45:40 +02:00
parent aaf898fde8
commit 51864da249
3 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
View File

@ -81,27 +81,27 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
<LinkIncremental>true</LinkIncremental>
<ImageXexOutput>$(OutDir)$(ProjectName).xex</ImageXexOutput>
<ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">
<LinkIncremental>true</LinkIncremental>
<ImageXexOutput>$(OutDir)$(ProjectName).xex</ImageXexOutput>
<ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">
<LinkIncremental>false</LinkIncremental>
<ImageXexOutput>$(OutDir)$(ProjectName).xex</ImageXexOutput>
<ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">
<LinkIncremental>false</LinkIncremental>
<ImageXexOutput>$(OutDir)$(ProjectName).xex</ImageXexOutput>
<ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">
<LinkIncremental>false</LinkIncremental>
<ImageXexOutput>$(OutDir)$(ProjectName).xex</ImageXexOutput>
<ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">
<LinkIncremental>false</LinkIncremental>
<ImageXexOutput>$(OutDir)$(ProjectName).xex</ImageXexOutput>
<ImageXexOutput>$(OutDir)default.xex</ImageXexOutput>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">
<ClCompile>
@ -294,4 +294,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

6
msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj.filters
View File

@ -20,9 +20,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\console\salamander\main.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\conf\config_file.c">
<Filter>Source Files\conf</Filter>
</ClCompile>
@ -38,5 +35,8 @@
<ClCompile Include="..\..\console\rarch_console_libretro_mgmt.c">
<Filter>Source Files\console</Filter>
</ClCompile>
<ClCompile Include="..\..\xdk\salamander\main.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

27
xdk/salamander/main.c
View File

@ -52,7 +52,7 @@ static void find_and_set_first_file(void)
char first_file[PATH_MAX];
rarch_manage_libretro_set_first_file(first_file, sizeof(first_file),
#if defined(_XBOX360)
"game:\\", "xex"
"game:", "xex"
#elif defined(_XBOX1)
"D:", "xbe"
#endif
@ -76,7 +76,7 @@ static void init_settings(void)
char tmp_str[PATH_MAX];
bool config_file_exists = false;
if(path_file_exists(SYS_CONFIG_FILE))
if(path_file_exists(default_paths.config_file))
config_file_exists = true;
//try to find CORE executable
@ -97,7 +97,7 @@ static void init_settings(void)
{
if(config_file_exists)
{
config_file_t * conf = config_file_new(SYS_CONFIG_FILE);
config_file_t * conf = config_file_new(default_paths.config_file);
config_get_array(conf, "libretro_path", tmp_str, sizeof(tmp_str));
snprintf(libretro_path, sizeof(libretro_path), tmp_str);
}
@ -158,11 +158,24 @@ static void get_environment_settings (void)
break;
}
}
#endif
strlcpy(default_paths.salamander_file, "RetroArch-Salamander.xex", sizeof(default_paths.salamander_file));
#elif defined(_XBOX1)
strlcpy(SYS_CONFIG_FILE, "D:\\retroarch.cfg", sizeof(SYS_CONFIG_FILE));
#if defined(_XBOX1)
strlcpy(default_paths.core_dir, "D:", sizeof(default_paths.core_dir));
strlcpy(default_paths.config_file, "D:\\retroarch.cfg", sizeof(default_paths.config_file));
strlcpy(default_paths.system_dir, "D:\\system", sizeof(default_paths.system_dir));
strlcpy(default_paths.filesystem_root_dir, "D:", sizeof(default_paths.filesystem_root_dir));
strlcpy(default_paths.executable_extension, ".xbe", sizeof(default_paths.executable_extension));
strlcpy(default_paths.filebrowser_startup_dir, "D:", sizeof(default_paths.filebrowser_startup_dir));
strlcpy(default_paths.screenshots_dir, "D:\\screenshots", sizeof(default_paths.screenshots_dir));
strlcpy(default_paths.salamander_file, "default.xbe", sizeof(default_paths.salamander_file));
#elif defined(_XBOX360)
strlcpy(default_paths.filesystem_root_dir, "game:\\", sizeof(default_paths.filesystem_root_dir));
strlcpy(default_paths.screenshots_dir, "game:", sizeof(default_paths.screenshots_dir));
strlcpy(default_paths.config_file, "game:\\retroarch.cfg", sizeof(default_paths.config_file));
strlcpy(default_paths.system_dir, "game:\\system\\", sizeof(default_paths.system_dir));
strlcpy(default_paths.executable_extension, ".xex", sizeof(default_paths.executable_extension));
snprintf(default_paths.salamander_file, sizeof(default_paths.salamander_file), "default.xex");
#endif
}
@ -193,4 +206,4 @@ int main(int argc, char *argv[])
rarch_console_exec(libretro_path);
return 1;
}
}