mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Xbox 1)) Changes

Browse Source
This commit is contained in:
TwinAphex51224 2012-06-24 21:25:11 +02:00
parent f201819ce0
commit d5bb5fd7af
10 changed files with 54 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/utils.h
View File

@ -16,7 +16,7 @@
#ifndef AUDIO_UTILS_H #ifndef AUDIO_UTILS_H
#define AUDIO_UTILS_H #define AUDIO_UTILS_H
#include <stdint.h> #include "../rarch_stdint.h"
#include <stddef.h> #include <stddef.h>
#if __SSE2__ #if __SSE2__

4
console/console_ext.c
View File

@ -285,7 +285,7 @@ static const struct platform_bind platform_keys[] = {
{ CTRL_UP_MASK | CTRL_RSTICK_UP_MASK, "RStick D-Pad Up" }, { CTRL_UP_MASK | CTRL_RSTICK_UP_MASK, "RStick D-Pad Up" },
{ CTRL_DOWN_MASK | CTRL_RSTICK_DOWN_MASK, "RStick D-Pad Down" }, { CTRL_DOWN_MASK | CTRL_RSTICK_DOWN_MASK, "RStick D-Pad Down" },
}; };
#elif defined(_XBOX) #elif defined(_XBOX360)
static const struct platform_bind platform_keys[] = { static const struct platform_bind platform_keys[] = {
{ XINPUT_GAMEPAD_B, "B button" }, { XINPUT_GAMEPAD_B, "B button" },
{ XINPUT_GAMEPAD_A, "A button" }, { XINPUT_GAMEPAD_A, "A button" },
@ -471,7 +471,7 @@ void rarch_input_set_controls_default (void)
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3] = platform_keys[PS3_DEVICE_ID_JOYPAD_R3].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3] = platform_keys[PS3_DEVICE_ID_JOYPAD_R3].joykey;
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2] = platform_keys[PS3_DEVICE_ID_JOYPAD_L2].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2] = platform_keys[PS3_DEVICE_ID_JOYPAD_L2].joykey;
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3] = platform_keys[PS3_DEVICE_ID_JOYPAD_L3].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3] = platform_keys[PS3_DEVICE_ID_JOYPAD_L3].joykey;
#elif defined(_XBOX) #elif defined(_XBOX360)
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[XDK360_DEVICE_ID_JOYPAD_A].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_B] = platform_keys[XDK360_DEVICE_ID_JOYPAD_A].joykey;
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[XDK360_DEVICE_ID_JOYPAD_X].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_Y] = platform_keys[XDK360_DEVICE_ID_JOYPAD_X].joykey;
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[XDK360_DEVICE_ID_JOYPAD_BACK].joykey; rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_SELECT] = platform_keys[XDK360_DEVICE_ID_JOYPAD_BACK].joykey;

12
console/griffin/griffin.c
View File

@ -86,7 +86,7 @@ VIDEO DRIVER
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
#include "../../gfx/gl.c" #include "../../gfx/gl.c"
#elif defined(_XBOX) #elif defined(_XBOX360)
#include "../../360/xdk360_video.cpp" #include "../../360/xdk360_video.cpp"
#elif defined(GEKKO) #elif defined(GEKKO)
#include "../../wii/video.c" #include "../../wii/video.c"
@ -100,7 +100,7 @@ FONTS
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
#include "../../gfx/fonts/ps3_libdbgfont.c" #include "../../gfx/fonts/ps3_libdbgfont.c"
#elif defined(_XBOX) #elif defined(_XBOX360)
#include "../../gfx/fonts/xdk360_fonts.cpp" #include "../../gfx/fonts/xdk360_fonts.cpp"
#elif defined(GEKKO) #elif defined(GEKKO)
#include "../../gfx/fonts/fonts.c" #include "../../gfx/fonts/fonts.c"
@ -111,7 +111,7 @@ INPUT
============================================================ */ ============================================================ */
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
#include "../../ps3/ps3_input.c" #include "../../ps3/ps3_input.c"
#elif defined(_XBOX) #elif defined(_XBOX360)
#include "../../360/xdk360_input.c" #include "../../360/xdk360_input.c"
#elif defined(GEKKO) #elif defined(GEKKO)
#include "../../wii/input.c" #include "../../wii/input.c"
@ -157,7 +157,7 @@ AUDIO
============================================================ */ ============================================================ */
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
#include "../../ps3/ps3_audio.c" #include "../../ps3/ps3_audio.c"
#elif defined(_XBOX) #elif defined(_XBOX360)
#include "../../360/xdk360_audio.cpp" #include "../../360/xdk360_audio.cpp"
#elif defined(GEKKO) #elif defined(GEKKO)
#include "../../wii/audio.c" #include "../../wii/audio.c"
@ -202,7 +202,7 @@ REWIND
/*============================================================ /*============================================================
MAIN MAIN
============================================================ */ ============================================================ */
#if defined(_XBOX) #if defined(_XBOX360)
#include "../../360/frontend-xdk/main.c" #include "../../360/frontend-xdk/main.c"
#elif defined(GEKKO) #elif defined(GEKKO)
#include "../../wii/frontend/main.c" #include "../../wii/frontend/main.c"
@ -230,7 +230,7 @@ NETPLAY
/*============================================================ /*============================================================
MENU MENU
============================================================ */ ============================================================ */
#if defined(_XBOX) #if defined(_XBOX360)
#include "../../360/frontend-xdk/menu.cpp" #include "../../360/frontend-xdk/menu.cpp"
#elif defined(GEKKO) #elif defined(GEKKO)
#include "../rgui/rgui.c" #include "../rgui/rgui.c"

2
fifo_buffer.c
View File

@ -14,7 +14,7 @@
*/ */
#include "fifo_buffer.h" #include "fifo_buffer.h"
#include <stdint.h> #include "rarch_stdint.h"
struct fifo_buffer struct fifo_buffer
{ {

5
file.c
View File

@ -26,12 +26,15 @@
#include "compat/strl.h" #include "compat/strl.h"
#include "hash.h" #include "hash.h"
#ifdef _XBOX360
#include <xtl.h>
#endif
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32) && !defined(_XBOX)
#include <io.h> #include <io.h>
#include <fcntl.h> #include <fcntl.h>
#include <windows.h> #include <windows.h>
#elif defined(_XBOX) #elif defined(_XBOX)
#include <xtl.h>
#define setmode _setmode #define setmode _setmode
#define INVALID_FILE_ATTRIBUTES -1 #define INVALID_FILE_ATTRIBUTES -1
#endif #endif

6
general.h
View File

@ -42,7 +42,7 @@
#include <time/time.h> #include <time/time.h>
#endif #endif
#if defined(XENON) || defined(__CELLOS_LV2__) #if defined(XENON) || defined(__CELLOS_LV2__) || defined(_XBOX1)
#undef PATH_MAX #undef PATH_MAX
#define PATH_MAX 4096 #define PATH_MAX 4096
#endif #endif
@ -64,7 +64,7 @@
#if defined(_WIN32) && !defined(_XBOX) #if defined(_WIN32) && !defined(_XBOX)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#elif defined(_XBOX) #elif defined(_XBOX360)
#include <xtl.h> #include <xtl.h>
#endif #endif
@ -245,7 +245,7 @@ struct console_settings
#ifdef RARCH_CONSOLE #ifdef RARCH_CONSOLE
uint32_t input_loop; uint32_t input_loop;
#endif #endif
#ifdef _XBOX #ifdef _XBOX360
uint32_t color_format; uint32_t color_format;
DWORD volume_device_type; DWORD volume_device_type;
#endif #endif

2
gfx/state_tracker.h
View File

@ -16,7 +16,7 @@
#ifndef __RARCH_SNES_TRACKER_H #ifndef __RARCH_SNES_TRACKER_H
#define __RARCH_SNES_TRACKER_H #define __RARCH_SNES_TRACKER_H
#include <stdint.h> #include "../rarch_stdint.h"
#include "../boolean.h" #include "../boolean.h"
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H

2
hash.h
View File

@ -16,7 +16,7 @@
#ifndef __RARCH_HASH_H #ifndef __RARCH_HASH_H
#define __RARCH_HASH_H #define __RARCH_HASH_H
#include <stdint.h> #include "rarch_stdint.h"
#include <stddef.h> #include <stddef.h>
// Hashes sha256 and outputs a human readable string for comparing with the cheat XML values. // Hashes sha256 and outputs a human readable string for comparing with the cheat XML values.

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

@ -20,11 +20,11 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;" AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;"
PreprocessorDefinitions="_XBOX;RARCH_CONSOLE" PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
MinimalRebuild="TRUE" MinimalRebuild="TRUE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
EnableEnhancedInstructionSet="1" EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="3" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="FALSE" Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="4"/> DebugInformationFormat="4"/>
@ -66,12 +66,12 @@
Optimization="3" Optimization="3"
OmitFramePointers="TRUE" OmitFramePointers="TRUE"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;" AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;"
PreprocessorDefinitions="_XBOX;RARCH_CONSOLE" PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
StringPooling="TRUE" StringPooling="TRUE"
BufferSecurityCheck="TRUE" BufferSecurityCheck="TRUE"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
EnableEnhancedInstructionSet="1" EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="3" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="FALSE" Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"/> DebugInformationFormat="3"/>
@ -115,11 +115,11 @@
Optimization="3" Optimization="3"
OmitFramePointers="TRUE" OmitFramePointers="TRUE"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;" AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;"
PreprocessorDefinitions="_XBOX;RARCH_CONSOLE" PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
StringPooling="TRUE" StringPooling="TRUE"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
EnableEnhancedInstructionSet="1" EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="3" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="FALSE" Detect64BitPortabilityProblems="FALSE"
DebugInformationFormat="3"/> DebugInformationFormat="3"/>
@ -156,7 +156,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="" AdditionalIncludeDirectories=""
PreprocessorDefinitions="_XBOX;RARCH_CONSOLE"/> PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
UsePrecompiledHeader="0"/>
<Tool <Tool
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
@ -189,7 +190,8 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;" AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\&quot;"
PreprocessorDefinitions="_XBOX;RARCH_CONSOLE"/> PreprocessorDefinitions="_XBOX;_XBOX1;RARCH_CONSOLE"
UsePrecompiledHeader="0"/>
<Tool <Tool
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
@ -224,12 +226,36 @@
Filter=""> Filter="">
<File <File
RelativePath="..\..\console\griffin\griffin.c"> RelativePath="..\..\console\griffin\griffin.c">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
<FileConfiguration
Name="Profile|Win32">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
<FileConfiguration
Name="Profile_FastCap|Win32">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32"> Name="Release|Win32">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
CompileAs="2"/> CompileAs="2"/>
</FileConfiguration> </FileConfiguration>
<FileConfiguration
Name="Release_LTCG|Win32">
<Tool
Name="VCCLCompilerTool"
CompileAs="2"/>
</FileConfiguration>
</File> </File>
</Filter> </Filter>
</Files> </Files>

2
patch.h
View File

@ -16,7 +16,7 @@
#ifndef __PATCH_H #ifndef __PATCH_H
#define __PATCH_H #define __PATCH_H
#include <stdint.h> #include "rarch_stdint.h"
#include <stddef.h> #include <stddef.h>
// BPS/UPS/IPS implementation from bSNES (nall::). // BPS/UPS/IPS implementation from bSNES (nall::).