# HG changeset patch # User Sam Lantinga # Date 1147317543 0 # Node ID 4c270c3a88ed070ed867c8f096d7d7ef35c6d47a # Parent 41ab83bec62ff0b2e3e52a480bd25579e4d9713e Fixed bug #225 Making the old code limp along, for Carbon builds. diff -r 41ab83bec62f -r 4c270c3a88ed src/timer/macos/FastTimes.c --- a/src/timer/macos/FastTimes.c Thu May 11 03:08:39 2006 +0000 +++ b/src/timer/macos/FastTimes.c Thu May 11 03:19:03 2006 +0000 @@ -19,6 +19,11 @@ #include "FastTimes.h" +#ifdef TARGET_CPU_PPC +#undef GENERATINGPOWERPC /* stop whining */ +#define GENERATINGPOWERPC TARGET_CPU_PPC +#endif + /* **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** */ /* **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** */ /* diff -r 41ab83bec62f -r 4c270c3a88ed src/timer/macos/SDL_systimer.c --- a/src/timer/macos/SDL_systimer.c Thu May 11 03:08:39 2006 +0000 +++ b/src/timer/macos/SDL_systimer.c Thu May 11 03:19:03 2006 +0000 @@ -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 @@ stop = SDL_GetTicks() + ms; do { + #ifdef TARGET_API_MAC_CARBON + MPYield(); + #else SystemTask(); + #endif now = SDL_GetTicks();