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

Get rid of OSX_PPC

Browse Source
This commit is contained in:
twinaphex 2016-09-09 15:56:56 +02:00
parent eb18aae600
commit 164d3b034c
8 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
audio/drivers/coreaudio.c
View File

@ -36,20 +36,12 @@
#include "../../configuration.h" #include "../../configuration.h"
#include "../../verbosity.h" #include "../../verbosity.h"
#if defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__)
#ifndef OSX_PPC
#define OSX_PPC
#endif
#endif
typedef struct coreaudio typedef struct coreaudio
{ {
slock_t *lock; slock_t *lock;
scond_t *cond; scond_t *cond;
#ifdef OSX_PPC #if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
ComponentInstance dev; ComponentInstance dev;
#else #else
AudioComponentInstance dev; AudioComponentInstance dev;
@ -74,7 +66,7 @@ static void coreaudio_free(void *data)
if (dev->dev_alive) if (dev->dev_alive)
{ {
AudioOutputUnitStop(dev->dev); AudioOutputUnitStop(dev->dev);
#ifdef OSX_PPC #if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
CloseComponent(dev->dev); CloseComponent(dev->dev);
#else #else
AudioComponentInstanceDispose(dev->dev); AudioComponentInstanceDispose(dev->dev);
@ -194,7 +186,7 @@ static void *coreaudio_init(const char *device,
size_t fifo_size; size_t fifo_size;
UInt32 i_size; UInt32 i_size;
AudioStreamBasicDescription real_desc; AudioStreamBasicDescription real_desc;
#ifdef OSX_PPC #if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
Component comp; Component comp;
#else #else
AudioComponent comp; AudioComponent comp;
@ -206,7 +198,7 @@ static void *coreaudio_init(const char *device,
AudioStreamBasicDescription stream_desc = {0}; AudioStreamBasicDescription stream_desc = {0};
bool component_unavailable = false; bool component_unavailable = false;
static bool session_initialized = false; static bool session_initialized = false;
#ifdef OSX_PPC #if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
ComponentDescription desc = {0}; ComponentDescription desc = {0};
#else #else
AudioComponentDescription desc = {0}; AudioComponentDescription desc = {0};
@ -241,7 +233,7 @@ static void *coreaudio_init(const char *device,
#endif #endif
desc.componentManufacturer = kAudioUnitManufacturer_Apple; desc.componentManufacturer = kAudioUnitManufacturer_Apple;
#ifdef OSX_PPC #if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
comp = FindNextComponent(NULL, &desc); comp = FindNextComponent(NULL, &desc);
#else #else
comp = AudioComponentFindNext(NULL, &desc); comp = AudioComponentFindNext(NULL, &desc);
@ -249,7 +241,7 @@ static void *coreaudio_init(const char *device,
if (comp == NULL) if (comp == NULL)
goto error; goto error;
#ifdef OSX_PPC #if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
component_unavailable = (OpenAComponent(comp, &dev->dev) != noErr); component_unavailable = (OpenAComponent(comp, &dev->dev) != noErr);
#else #else
component_unavailable = (AudioComponentInstanceNew(comp, &dev->dev) != noErr); component_unavailable = (AudioComponentInstanceNew(comp, &dev->dev) != noErr);

2
config.def.h
View File

@ -554,7 +554,7 @@ static float menu_footer_opacity = 1.000;
static float menu_header_opacity = 1.000; static float menu_header_opacity = 1.000;
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) || defined(HAVE_VULKAN) #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) || defined(HAVE_VULKAN)
#if defined(HAVE_OPENGLES2) || defined(OSX_PPC) #if defined(HAVE_OPENGLES2) || (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
static unsigned menu_shader_pipeline = 1; static unsigned menu_shader_pipeline = 1;
#else #else
static unsigned menu_shader_pipeline = 2; static unsigned menu_shader_pipeline = 2;

2
frontend/drivers/platform_darwin.m
View File

@ -697,7 +697,7 @@ static uint64_t frontend_darwin_get_mem_total(void)
static uint64_t frontend_darwin_get_mem_used(void) static uint64_t frontend_darwin_get_mem_used(void)
{ {
#if defined(OSX) && !defined(OSX_PPC) #if (defined(OSX) && !(defined(__ppc__) || defined(__ppc64__)))
vm_size_t page_size; vm_size_t page_size;
vm_statistics64_data_t vm_stats; vm_statistics64_data_t vm_stats;
mach_port_t mach_port = mach_host_self(); mach_port_t mach_port = mach_host_self();

6
gfx/drivers/gl_capabilities.h
View File

@ -50,7 +50,7 @@
#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES #define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES #define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES
#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT #define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
#elif defined(OSX_PPC) #elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT #define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT
#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_EXT #define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_EXT
#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT #define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
@ -69,7 +69,7 @@
#endif #endif
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT #define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT #define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT
#elif defined(OSX_PPC) #elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER_EXT #define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER_EXT
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT #define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT #define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT
@ -86,7 +86,7 @@
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT #define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT
#endif #endif
#ifdef OSX_PPC #if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
#define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE_EXT #define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE_EXT
#elif defined(HAVE_PSGL) #elif defined(HAVE_PSGL)
#define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE_OES #define RARCH_GL_MAX_RENDERBUFFER_SIZE GL_MAX_RENDERBUFFER_SIZE_OES

2
gfx/drivers/gl_renderchains/render_chain_gl_legacy.c
View File

@ -898,7 +898,7 @@ bool gl_init_hw_render(gl_t *gl, unsigned width, unsigned height)
if (stencil) if (stencil)
{ {
#if defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES1) || defined(OSX_PPC) #if defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES1) || ((defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))))
/* GLES2 is a bit weird, as always. /* GLES2 is a bit weird, as always.
* There's no GL_DEPTH_STENCIL_ATTACHMENT like in desktop GL. */ * There's no GL_DEPTH_STENCIL_ATTACHMENT like in desktop GL. */
glFramebufferRenderbuffer(RARCH_GL_FRAMEBUFFER, glFramebufferRenderbuffer(RARCH_GL_FRAMEBUFFER,

4
libretro-common/include/glsm/glsm.h
View File

@ -41,7 +41,7 @@ typedef GLclampf GLclampd;
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES #define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT #define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT
#define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT #define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT
#elif defined(OSX_PPC) #elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
#define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER_EXT #define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER_EXT
#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT #define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT
#define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT #define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT
@ -62,7 +62,7 @@ typedef GLclampf GLclampd;
#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES #define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES #define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_OES
#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT #define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
#elif defined(OSX_PPC) #elif (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
#define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT #define RARCH_GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT
#define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_EXT #define RARCH_GL_FRAMEBUFFER_COMPLETE GL_FRAMEBUFFER_COMPLETE_EXT
#define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT #define RARCH_GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT

2
pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj
View File

@ -289,7 +289,6 @@
"-DHAVE_RGUI", "-DHAVE_RGUI",
"-DHAVE_MENU", "-DHAVE_MENU",
"-DOSX", "-DOSX",
"-DOSX_PPC",
"-DHAVE_OPENGL", "-DHAVE_OPENGL",
"-DHAVE_FBO", "-DHAVE_FBO",
"-DHAVE_GLSL", "-DHAVE_GLSL",
@ -364,7 +363,6 @@
"-DHAVE_RGUI", "-DHAVE_RGUI",
"-DHAVE_MENU", "-DHAVE_MENU",
"-DOSX", "-DOSX",
"-DOSX_PPC",
"-DHAVE_OPENGL", "-DHAVE_OPENGL",
"-DHAVE_FBO", "-DHAVE_FBO",
"-DHAVE_GLSL", "-DHAVE_GLSL",

2
ui/drivers/ui_cocoa.m
View File

@ -38,7 +38,7 @@
id apple_platform; id apple_platform;
#ifdef OSX_PPC #if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
@interface RetroArch_OSX : NSObject @interface RetroArch_OSX : NSObject
#else #else
@interface RetroArch_OSX : NSObject <NSApplicationDelegate> @interface RetroArch_OSX : NSObject <NSApplicationDelegate>