(Xbox 1) Debug output working

This commit is contained in:
twinaphex 2012-07-08 16:43:50 +03:00
parent 9a1fe3dbfb
commit 65d4d44dc6
4 changed files with 37 additions and 13 deletions

View File

@ -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;
}
}

View File

@ -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);
}
}

View File

@ -4,6 +4,7 @@
Version="7.10"
Name="RetroArch"
ProjectGUID="{0E616FC4-0954-4FE3-935C-B7383B18D325}"
RootNamespace="RetroArch"
Keyword="XboxProj">
<Platforms>
<Platform
@ -34,7 +35,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xactengd.lib xsndtrkd.lib xvoiced.lib xonlined.lib xboxkrnl.lib xbdm.lib"
AdditionalDependencies="xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xactengd.lib xsndtrkd.lib xvoiced.lib xonlined.lib xboxkrnl.lib xbdm.lib $(TargetDir)libretro_xdk.lib"
OutputFile="$(OutDir)/$(ProjectName).exe"
LinkIncremental="2"
GenerateDebugInformation="TRUE"
@ -82,7 +83,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="xapilib.lib d3d8i.lib d3dx8.lib xgraphics.lib dsound.lib dmusici.lib xactengi.lib xsndtrk.lib xvoice.lib xonlines.lib xboxkrnl.lib xbdm.lib xperf.lib"
AdditionalDependencies="xapilib.lib d3d8i.lib d3dx8.lib xgraphics.lib dsound.lib dmusici.lib xactengi.lib xsndtrk.lib xvoice.lib xonlines.lib xboxkrnl.lib xbdm.lib xperf.lib $(TargetDir)libretro_xdk.lib"
OutputFile="$(OutDir)/$(ProjectName).exe"
LinkIncremental="1"
GenerateDebugInformation="TRUE"
@ -134,7 +135,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="xapilib.lib d3d8i.lib d3dx8.lib xgraphics.lib dsound.lib dmusici.lib xactengi.lib xsndtrk.lib xvoice.lib xonlines.lib xboxkrnl.lib xbdm.lib xperf.lib"
AdditionalDependencies="xapilib.lib d3d8i.lib d3dx8.lib xgraphics.lib dsound.lib dmusici.lib xactengi.lib xsndtrk.lib xvoice.lib xonlines.lib xboxkrnl.lib xbdm.lib xperf.lib $(TargetDir)libretro_xdk.lib"
OutputFile="$(OutDir)/$(ProjectName).exe"
LinkIncremental="1"
GenerateDebugInformation="TRUE"
@ -185,7 +186,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="xapilib.lib d3d8.lib d3dx8.lib xgraphics.lib dsound.lib dmusic.lib xacteng.lib xsndtrk.lib xvoice.lib xonlines.lib xboxkrnl.lib"
AdditionalDependencies="xapilib.lib d3d8.lib d3dx8.lib xgraphics.lib dsound.lib dmusic.lib xacteng.lib xsndtrk.lib xvoice.lib xonlines.lib xboxkrnl.lib $(TargetDir)libretro_xdk.lib"
OutputFile="$(OutDir)/$(ProjectName).exe"
LinkIncremental="1"
GenerateDebugInformation="TRUE"
@ -235,7 +236,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="xapilib.lib d3d8ltcg.lib d3dx8.lib xgraphicsltcg.lib dsound.lib dmusicltcg.lib xactengltcg.lib xsndtrk.lib xvoice.lib xonlines.lib xboxkrnl.lib"
AdditionalDependencies="xapilib.lib d3d8ltcg.lib d3dx8.lib xgraphicsltcg.lib dsound.lib dmusicltcg.lib xactengltcg.lib xsndtrk.lib xvoice.lib xonlines.lib xboxkrnl.lib $(TargetDir)libretro_xdk.lib"
OutputFile="$(OutDir)/$(ProjectName).exe"
LinkIncremental="1"
GenerateDebugInformation="TRUE"

View File

@ -21,28 +21,37 @@
static inline void RARCH_LOG(const char *msg, ...)
{
char msg_new[1024], buffer[1024];
snprintf(msg_new, sizeof(msg_new), "RetroArch: %s", msg);
va_list ap;
va_start(ap, msg);
fprintf(stderr, "RetroArch: ");
vfprintf(stderr, msg, ap);
wvsprintf(buffer, msg_new, ap);
buffer[ (sizeof(buffer) / sizeof( *buffer)) - 1] = '\0';
OutputDebugStringA(buffer);
va_end(ap);
}
static inline void RARCH_WARN(const char *msg, ...)
{
char msg_new[1024], buffer[1024];
snprintf(msg_new, sizeof(msg_new), "RetroArch [WARN] :: %s", msg);
va_list ap;
va_start(ap, msg);
fprintf(stderr, "RetroArch [WARN] :: ");
vfprintf(stderr, msg, ap);
wvsprintf(buffer, msg_new, ap);
buffer[ (sizeof(buffer) / sizeof( *buffer)) - 1] = '\0';
OutputDebugStringA(buffer);
va_end(ap);
}
static inline void RARCH_ERR(const char *msg, ...)
{
char msg_new[1024], buffer[1024];
snprintf(msg_new, sizeof(msg_new), "RetroArch [ERR] :: %s", msg);
va_list ap;
va_start(ap, msg);
fprintf(stderr, "RetroArch [ERR] :: ");
vfprintf(stderr, msg, ap);
wvsprintf(buffer, msg_new, ap);
buffer[ (sizeof(buffer) / sizeof( *buffer)) - 1] = '\0';
OutputDebugStringA(buffer);
va_end(ap);
}