The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2024-12-27 03:31:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from libretro/master

Browse Source 
Update/build fix Libretro core
This commit is contained in:
ekeeke 2014-07-19 10:47:06 +02:00
commit 8acb663868
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/tremor/misc.h
View File

@ -37,23 +37,6 @@
#include <sys/types.h> #include <sys/types.h>
#endif #endif
#if !defined(__LIBRETRO__) && defined(GEKKO)
#ifndef __CELLOS_LV2__
#ifndef _XBOX360
#if BYTE_ORDER==LITTLE_ENDIAN
union magic {
struct {
ogg_int32_t lo;
ogg_int32_t hi;
} halves;
ogg_int64_t whole;
};
#endif
#endif
#endif
#endif
#ifndef ANDROID
#if BYTE_ORDER==BIG_ENDIAN #if BYTE_ORDER==BIG_ENDIAN
union magic { union magic {
struct { struct {
@ -62,7 +45,14 @@ union magic {
} halves; } halves;
ogg_int64_t whole; ogg_int64_t whole;
}; };
#endif #elif BYTE_ORDER==LITTLE_ENDIAN
union magic {
struct {
ogg_int32_t lo;
ogg_int32_t hi;
} halves;
ogg_int64_t whole;
};
#endif #endif
STIN ogg_int32_t MULT32(ogg_int32_t x, ogg_int32_t y) { STIN ogg_int32_t MULT32(ogg_int32_t x, ogg_int32_t y) {

2
libretro/libretro.c
View File

@ -855,7 +855,7 @@ void retro_set_controller_port_device(unsigned port, unsigned device)
case RETRO_DEVICE_SMSPAD_4P: case RETRO_DEVICE_SMSPAD_4P:
config.input[port].padtype = DEVICE_PAD2B; config.input[port].padtype = DEVICE_PAD2B;
input.dev[port] = DEVICE_PAD2B; input.dev[port] = DEVICE_PAD2B;
input.system[0] = SYSTEM_MS4PLAY; input.system[0] = SYSTEM_MASTERTAP;
break; break;
case RETRO_DEVICE_JOYPAD: case RETRO_DEVICE_JOYPAD:
default: default: