mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

(360) 360 uses Griffin now too

Browse Source
This commit is contained in:
TwinAphex51224 2012-03-29 12:04:58 +02:00
parent 07c839f003
commit a860a71016
12 changed files with 47 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
360/file_browser.c
View File

@ -16,8 +16,6 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#define NOD3D
#define NONET
#include <xtl.h>
#include "file_browser.h"
#include "../general.h"

5
360/shared.h
View File

@ -16,6 +16,9 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _360_SHARED_H
#define _360_SHARED_H
#define MAX_PATH_LENGTH 1024
enum
@ -57,3 +60,5 @@ enum {
};
#define MENU_ITEM_LAST MENU_ITEM_RETURN_TO_DASHBOARD+1
#endif

2
360/xdk360_audio.cpp
View File

@ -17,8 +17,6 @@
#include "../driver.h"
#include <stdlib.h>
#define NOD3D
#define NONET
#include <xtl.h>
#include "xaudio-c/xaudio.h"
#include "../general.h"

2
360/xdk360_input.c
View File

@ -18,8 +18,6 @@
#include <stdint.h>
#include <stdlib.h>
#define NOD3D
#define NONET
#include <xtl.h>
#include "../driver.h"
#include "../general.h"

3
360/xdk360_video.cpp
View File

@ -16,12 +16,9 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#define NONET
#include <xtl.h>
#include <xgraphics.h>
#include "../driver.h"
#include "xdk360_video.h"
#include "xdk360_video_resources.h"
#include "../general.h"

5
compat/posix_string.h
View File

@ -19,18 +19,23 @@
#define __SSNES_POSIX_STRING_H
#ifdef _WIN32
#ifdef __cplusplus
extern "C" {
#endif
#undef strcasecmp
#define strcasecmp(a, b) strcasecmp_ssnes__(a, b)
#define strdup(orig) strdup_ssnes__(orig)
#define isblank(c) isblank_ssnes__(c)
int strcasecmp(const char *a, const char *b);
char *strdup(const char *orig);
int isblank(int c);
#ifdef __cplusplus
}
#endif
#endif
#endif

38
console/griffin/griffin.c
View File

@ -16,6 +16,10 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#if defined(_XBOX)
#include "../../msvc/msvc_compat.h"
#endif
/*============================================================
CONSOLE EXTENSIONS
============================================================ */
@ -29,21 +33,31 @@
/*============================================================
CONFIG FILE
============================================================ */
#ifdef _XBOX
#undef __SSNES_POSIX_STRING_H
#undef __SSNES_MSVC_COMPAT_H
#undef strcasecmp
#endif
#include "../../conf/config_file.c"
/*============================================================
VIDEO
============================================================ */
#ifdef __CELLOS_LV2__
#if defined(__CELLOS_LV2__)
#include "../../ps3/ps3_video_psgl.c"
#include "../../ps3/image.c"
#elif defined(_XBOX)
#include "../../360/xdk360_video.cpp"
#include "../../360/fonts.cpp"
#endif
/*============================================================
INPUT
============================================================ */
#ifdef __CELLOS_LV2__
#if defined(__CELLOS_LV2__)
#include "../../ps3/ps3_input.c"
#elif defined(_XBOX)
#include "../../360/xdk360_input.c"
#endif
/*============================================================
@ -66,15 +80,13 @@
============================================================ */
#include "../../audio/hermite.c"
/*============================================================
LIBRSOUND
============================================================ */
#include "../../console/librsound/librsound.c"
/*============================================================
RSOUND
============================================================ */
#ifdef __CELLOS_LV2__
#include "../../console/librsound/librsound.c"
#include "../../audio/rsound.c"
#endif
/*============================================================
AUDIO UTILS
@ -84,8 +96,10 @@
/*============================================================
AUDIO
============================================================ */
#ifdef __CELLOS_LV2__
#if defined(__CELLOS_LV2__)
#include "../../ps3/ps3_audio.c"
#elif defined(_XBOX)
#include "../../360/xdk360_audio.cpp"
#endif
/*============================================================
@ -96,8 +110,10 @@
/*============================================================
FILE
============================================================ */
#ifdef __CELLOS_LV2__
#if defined(__CELLOS_LV2__)
#include "../../ps3/file_browser.c"
#elif defined(_XBOX)
#include "../../360/file_browser.c"
#endif
#include "../../file.c"
@ -126,8 +142,10 @@
/*============================================================
MAIN
============================================================ */
#ifdef __CELLOS_LV2__
#if defined(__CELLOS_LV2__)
#include "../../ps3/main.c"
#elif defined(_XBOX)
#include "../../360/main.c"
#endif
/*============================================================

2
file.c
View File

@ -40,8 +40,6 @@
#define setmode _setmode
#endif
#elif defined(_XBOX)
#define NOD3D
#define NONET
#include <xtl.h>
#define setmode _setmode
#define INVALID_FILE_ATTRIBUTES -1

1
general.h
View File

@ -63,7 +63,6 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#elif defined(_XBOX)
#define NOD3D
#include <xtl.h>
#endif

26
msvc-360/SSNES-360/SSNES-360.vcxproj
View File

@ -347,18 +347,8 @@
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\360\file_browser.c" />
<ClCompile Include="..\..\360\fonts.cpp" />
<ClCompile Include="..\..\360\main.c" />
<ClCompile Include="..\..\360\xdk360_audio.cpp" />
<ClCompile Include="..\..\360\xdk360_input.c" />
<ClCompile Include="..\..\360\xdk360_video.cpp" />
<ClCompile Include="..\..\360\menu.cpp" />
<ClCompile Include="..\..\audio\hermite.c" />
<ClCompile Include="..\..\audio\utils.c" />
<ClCompile Include="..\..\compat\compat.c" />
<ClCompile Include="..\..\conf\config_file.c" />
<ClCompile Include="..\..\console\console_ext.c" />
<ClCompile Include="..\..\console\griffin\griffin.c" />
<ClCompile Include="..\..\console\szlib\szlib.c">
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
@ -367,20 +357,6 @@
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">CompileAsC</CompileAs>
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
</ClCompile>
<ClCompile Include="..\..\driver.c" />
<ClCompile Include="..\..\dynamic.c" />
<ClCompile Include="..\..\fifo_buffer.c" />
<ClCompile Include="..\..\file.c" />
<ClCompile Include="..\..\message.c" />
<ClCompile Include="..\..\netplay.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\patch.c" />
<ClCompile Include="..\..\rewind.c" />
<ClCompile Include="..\..\screenshot.c" />
<ClCompile Include="..\..\settings.c" />
<ClCompile Include="..\..\ssnes.c" />
<ClCompile Include="..\..\thread.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\360\menu.h" />

82
msvc-360/SSNES-360/SSNES-360.vcxproj.filters
View File

@ -18,15 +18,9 @@
<Filter Include="Source Files\360">
<UniqueIdentifier>{b9371e8d-2e72-4ced-8bf6-6ee6a77a1f78}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\audio">
<UniqueIdentifier>{c8038d65-499b-493b-80e9-90bd7c57383f}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\conf">
<UniqueIdentifier>{755ce6db-d242-40fb-9c8b-c14154fc94e1}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\conf">
<UniqueIdentifier>{82e8787f-e939-4783-82e1-fcab34285121}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\media">
<UniqueIdentifier>{b7d54b1f-ffda-45f9-8175-7bf67010253d}</UniqueIdentifier>
</Filter>
@ -39,88 +33,22 @@
<Filter Include="Source Files\media\shader">
<UniqueIdentifier>{3a05047b-b9ec-4821-bb28-d1b0e9e3e8bb}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\compat">
<UniqueIdentifier>{34c33a54-e69d-4fb2-ba70-ae9c34654825}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\compat">
<UniqueIdentifier>{cf25b88e-c7b2-4823-876a-ed0dd8020821}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\console\griffin">
<UniqueIdentifier>{c868cc96-a0ac-4672-a4ca-dd7c28277972}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\360\xdk360_video.cpp">
<Filter>Source Files\360</Filter>
</ClCompile>
<ClCompile Include="..\..\driver.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\dynamic.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\fifo_buffer.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\file.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\message.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\netplay.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\rewind.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\screenshot.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\settings.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\ssnes.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\thread.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\hermite.c">
<Filter>Source Files\audio</Filter>
</ClCompile>
<ClCompile Include="..\..\audio\utils.c">
<Filter>Source Files\audio</Filter>
</ClCompile>
<ClCompile Include="..\..\360\xdk360_audio.cpp">
<Filter>Source Files\360</Filter>
</ClCompile>
<ClCompile Include="..\..\360\main.c">
<Filter>Source Files\360</Filter>
</ClCompile>
<ClCompile Include="..\..\conf\config_file.c">
<Filter>Source Files\conf</Filter>
</ClCompile>
<ClCompile Include="..\..\360\menu.cpp">
<Filter>Source Files\360</Filter>
</ClCompile>
<ClCompile Include="..\..\360\file_browser.c">
<Filter>Source Files\360</Filter>
</ClCompile>
<ClCompile Include="..\..\360\fonts.cpp">
<Filter>Source Files\360</Filter>
</ClCompile>
<ClCompile Include="..\..\console\szlib\szlib.c">
<Filter>Source Files\console\szlib</Filter>
</ClCompile>
<ClCompile Include="..\..\console\console_ext.c">
<Filter>Source Files\console</Filter>
</ClCompile>
<ClCompile Include="..\..\360\xdk360_input.c">
<Filter>Source Files\360</Filter>
</ClCompile>
<ClCompile Include="..\..\patch.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\compat\compat.c">
<Filter>Source Files\compat</Filter>
<ClCompile Include="..\..\console\griffin\griffin.c">
<Filter>Source Files\console\griffin</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>

7
msvc/msvc_compat.h
View File

@ -35,6 +35,8 @@ typedef int ssize_t;
#define snprintf _snprintf
#define strtoull _strtoui64
#undef strcasecmp
#define strcasecmp _stricmp
// Disable some of the annoying warnings.
#pragma warning(disable : 4800)
@ -43,10 +45,7 @@ typedef int ssize_t;
#pragma warning(disable : 4146)
#pragma warning(disable : 4267)
static inline float roundf(float in)
{
return in >= 0.0f ? floorf(in + 0.5f) : ceilf(in - 0.5f);
}
#define roundf(in) (in >= 0.0f ? floorf(in + 0.5f) : ceilf(in - 0.5f))
#ifndef PATH_MAX
#define PATH_MAX MAX_PATH