Mercurial > sdl-ios-xcode
view src/timer/macos/SDL_systimer.c @ 4427:eada7e321df6 SDL-1.2
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.) Two patches, one for SDL-1.2
and one for SDL-1.3 attached.
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file. SDL_dx5yuv.c (SDL-1.2-only) also needs to
include the header before SDL_video.h to avoid the same problem.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:04:13 +0000 |
parents | a1b03ba2fcd0 |
children |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2009 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org */ #include "SDL_config.h" #ifdef SDL_TIMER_MACOS #include <Types.h> #include <Timer.h> #include <OSUtils.h> #include <Gestalt.h> #include <Processes.h> #include <LowMem.h> #include "SDL_timer.h" #include "../SDL_timer_c.h" #include "FastTimes.h" #if TARGET_API_MAC_CARBON #define NewTimerProc NewTimerUPP #endif #define MS_PER_TICK (1000.0/60.0) /* MacOS tick = 1/60 second */ #define kTwoPower32 (4294967296.0) /* 2^32 */ static double start_tick; static int is_fast_inited = 0; void SDL_StartTicks(void) { if ( ! is_fast_inited ) // important to check or FastTime may hang machine! SDL_SYS_TimerInit(); start_tick = FastMicroseconds(); } Uint32 SDL_GetTicks(void) { if ( ! is_fast_inited ) SDL_SYS_TimerInit(); return FastMilliseconds(); } void SDL_Delay(Uint32 ms) { Uint32 stop, now; stop = SDL_GetTicks() + ms; do { #if TARGET_API_MAC_CARBON MPYield(); #else SystemTask(); #endif now = SDL_GetTicks(); } while ( stop > now ); } /* void SDL_StartTicks(void) { // FIXME: Should we implement a wrapping algorithm, like Win32? } Uint32 SDL_GetTicks(void) { UnsignedWide ms; Microseconds (&ms); return ( ms.lo / 1000 ); } void SDL_Delay(Uint32 ms) { UnsignedWide microsecs; UInt32 stop; Microseconds (µsecs); stop = microsecs.lo + (ms * 1000); while ( stop > microsecs.lo ) { SystemTask (); Microseconds (µsecs); } }*/ /* Data to handle a single periodic alarm */ typedef struct _ExtendedTimerRec { TMTask tmTask; ProcessSerialNumber taskPSN; } ExtendedTimerRec, *ExtendedTimerPtr; static ExtendedTimerRec gExtendedTimerRec; int SDL_SYS_TimerInit(void) { FastInitialize (); is_fast_inited = 1; return(0); } void SDL_SYS_TimerQuit(void) { /* We don't need a cleanup? */ return; } /* Our Stub routine to set up and then call the real routine. */ pascal void TimerCallbackProc(TMTaskPtr tmTaskPtr) { Uint32 ms; WakeUpProcess(&((ExtendedTimerPtr) tmTaskPtr)->taskPSN); ms = SDL_alarm_callback(SDL_alarm_interval); if ( ms ) { SDL_alarm_interval = ROUND_RESOLUTION(ms); PrimeTime((QElemPtr)&gExtendedTimerRec.tmTask, SDL_alarm_interval); } else { SDL_alarm_interval = 0; } } int SDL_SYS_StartTimer(void) { /* * Configure the global structure that stores the timing information. */ gExtendedTimerRec.tmTask.qLink = NULL; gExtendedTimerRec.tmTask.qType = 0; gExtendedTimerRec.tmTask.tmAddr = NewTimerProc(TimerCallbackProc); gExtendedTimerRec.tmTask.tmCount = 0; gExtendedTimerRec.tmTask.tmWakeUp = 0; gExtendedTimerRec.tmTask.tmReserved = 0; GetCurrentProcess(&gExtendedTimerRec.taskPSN); /* Install the task record */ InsXTime((QElemPtr)&gExtendedTimerRec.tmTask); /* Go! */ PrimeTime((QElemPtr)&gExtendedTimerRec.tmTask, SDL_alarm_interval); return(0); } void SDL_SYS_StopTimer(void) { RmvTime((QElemPtr)&gExtendedTimerRec.tmTask); } #endif /* SDL_TIMER_MACOS */