mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-14 01:19:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Xbox 1) Fixups to PACKAGE_VERSION define / settings function

Browse Source
This commit is contained in:
TwinAphex51224 2012-06-24 22:54:43 +02:00
parent b5acc3863e
commit 0ef1e9e4ab
4 changed files with 17 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
console/console_settings.c
View File

@ -230,33 +230,31 @@ void rarch_settings_create_menu_item_label_w(wchar_t *strwbuf, unsigned setting,
void rarch_settings_create_menu_item_label(char * str, unsigned setting, size_t size)
{
size_t SIZEOF_STR = size;
switch (setting)
{
case S_LBL_ASPECT_RATIO:
snprintf(str, SIZEOF_STR, "Aspect Ratio: %s", aspectratio_lut[g_console.aspect_ratio_index].name);
snprintf(str, size, "Aspect Ratio: %s", aspectratio_lut[g_console.aspect_ratio_index].name);
break;
case S_LBL_SHADER:
snprintf(str, SIZEOF_STR, "Shader #1: %s", g_settings.video.cg_shader_path);
snprintf(str, size, "Shader #1: %s", g_settings.video.cg_shader_path);
break;
case S_LBL_SHADER_2:
snprintf(str, SIZEOF_STR, "Shader #2: %s", g_settings.video.second_pass_shader);
snprintf(str, size, "Shader #2: %s", g_settings.video.second_pass_shader);
break;
case S_LBL_RARCH_VERSION:
snprintf(str, SIZEOF_STR, "RetroArch %s", PACKAGE_VERSION);
snprintf(str, size, "RetroArch %s", PACKAGE_VERSION);
break;
case S_LBL_SCALE_FACTOR:
snprintf(str, SIZEOF_STR, "Scale Factor: %f (X) / %f (Y)", g_settings.video.fbo_scale_x, g_settings.video.fbo_scale_y);
snprintf(str, size, "Scale Factor: %f (X) / %f (Y)", g_settings.video.fbo_scale_x, g_settings.video.fbo_scale_y);
break;
case S_LBL_ROTATION:
snprintf(str, SIZEOF_STR, "Rotation: %s", rotation_lut[g_console.screen_orientation]);
snprintf(str, size, "Rotation: %s", rotation_lut[g_console.screen_orientation]);
break;
case S_LBL_LOAD_STATE_SLOT:
snprintf(str, SIZEOF_STR, "Load State #%d", g_extern.state_slot);
snprintf(str, size, "Load State #%d", g_extern.state_slot);
break;
case S_LBL_SAVE_STATE_SLOT:
snprintf(str, SIZEOF_STR, "Save State #%d", g_extern.state_slot);
snprintf(str, size, "Save State #%d", g_extern.state_slot);
break;
}
}

5
file_path.c
View File

@ -27,6 +27,10 @@
#define S_ISDIR(x) (x & CELL_FS_S_IFDIR)
#endif
#ifdef _XBOX360
#include <xtl.h>
#endif
#if defined(_WIN32) && !defined(_XBOX)
#include <io.h>
#include <fcntl.h>
@ -35,7 +39,6 @@
#define setmode _setmode
#endif
#elif defined(_XBOX)
#include <xtl.h>
#define setmode _setmode
#define INVALID_FILE_ATTRIBUTES -1
#else

10
msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj
View File

@ -20,7 +20,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;"
PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=&quot;0.9.6&quot;"
PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=\&quot;0.9.6\&quot;"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
EnableEnhancedInstructionSet="1"
@ -66,7 +66,7 @@
Optimization="3"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;"
PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=&quot;0.9.6&quot;"
PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=\&quot;0.9.6\&quot;"
StringPooling="TRUE"
BufferSecurityCheck="TRUE"
EnableFunctionLevelLinking="TRUE"
@ -115,7 +115,7 @@
Optimization="3"
OmitFramePointers="TRUE"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;"
PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=&quot;0.9.6&quot;"
PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=\&quot;0.9.6\&quot;"
StringPooling="TRUE"
EnableFunctionLevelLinking="TRUE"
EnableEnhancedInstructionSet="1"
@ -156,7 +156,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;"
PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=&quot;0.9.6&quot;"
PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=\&quot;0.9.6\&quot;"
UsePrecompiledHeader="0"/>
<Tool
Name="VCCustomBuildTool"/>
@ -191,7 +191,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\msvc-stdint&quot;;&quot;$(SolutionDir)\msvc-71&quot;"
PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=&quot;0.9.6&quot;"
PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE;PACKAGE_VERSION=\&quot;0.9.6\&quot;"
UsePrecompiledHeader="0"/>
<Tool
Name="VCCustomBuildTool"/>

46
msvc/msvc-71/logger_override.h~
View File

@ -1,46 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2012 - Hans-Kristian Arntzen
* Copyright (C) 2011-2012 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __MSVC_71_H
#define __MSVC_71_H
#include <stdargs.h>
static inline void RARCH_LOG(const char *msg, ...)
{
va_list ap;
va_start(ap, msg);
vfprintf(stderr, msg, ap);
va_end(ap);
}
static inline void RARCH_WARN(const char *msg, ...)
{
va_list ap;
va_start(ap, msg);
vfprintf(stderr, msg, ap);
va_end(ap);
}
static inline void RARCH_ERR(const char *msg, ...)
{
va_list ap;
va_start(ap, msg);
vfprintf(stderr, msg, ap);
va_end(ap);
}
#endif