From e494c2b3f0d8e5f189869e538859090e557970c6 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 11 May 2006 03:19:03 +0000 Subject: [PATCH] Fixed bug #225 Making the old code limp along, for Carbon builds. --- src/timer/macos/FastTimes.c | 5 +++++ src/timer/macos/SDL_systimer.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/src/timer/macos/FastTimes.c b/src/timer/macos/FastTimes.c index c7e7e0b94..8eb4260fb 100644 --- a/src/timer/macos/FastTimes.c +++ b/src/timer/macos/FastTimes.c @@ -19,6 +19,11 @@ #include "FastTimes.h" +#ifdef TARGET_CPU_PPC +#undef GENERATINGPOWERPC /* stop whining */ +#define GENERATINGPOWERPC TARGET_CPU_PPC +#endif + /* **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** */ /* **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** */ /* diff --git a/src/timer/macos/SDL_systimer.c b/src/timer/macos/SDL_systimer.c index e7ee17a4d..b91443769 100644 --- a/src/timer/macos/SDL_systimer.c +++ b/src/timer/macos/SDL_systimer.c @@ -36,6 +36,10 @@ #include "FastTimes.h" +#ifdef TARGET_API_MAC_CARBON +#define NewTimerProc NewTimerUPP +#endif + #define MS_PER_TICK (1000.0/60.0) /* MacOS tick = 1/60 second */ @@ -67,7 +71,11 @@ void SDL_Delay(Uint32 ms) stop = SDL_GetTicks() + ms; do { + #ifdef TARGET_API_MAC_CARBON + MPYield(); + #else SystemTask(); + #endif now = SDL_GetTicks();