Mercurial > sdl-ios-xcode
annotate src/thread/win32/SDL_systhread.c @ 1135:cf6133247d34
Mac Classic and CodeWarrior patches.
--ryan.
From: =?ISO-8859-1?Q?Anders_F_Bj=F6rklund?= <afb@algonet.se>
Subject: Re: [SDL] Updated Mac patch
Date: Tue, 6 Sep 2005 15:21:27 +0200
To: A list for developers using the SDL library <sdl@libsdl.org>
Earlier, I wrote:
> Updated the previous Mac patch to disable Carbon by default.
> Also "fixed" the SDL.spec again, so that it builds on Darwin.
>
> http://www.algonet.se/~afb/SDL-1.2.9-mac.patch
> Also applied fine to SDL12 CVS, when I tried it.
>
> Haven't completed any new packaging or projects for Xcode/PB,
> but it seems to build and install fine here (in development).
Tested the new patch to build with old CodeWarrior and MPW,
and it seems it needed some hacks with those old headers...
Just in case you want to support the archeological versions -
here is a small add-on to the above patch, to fix those...
http://www.algonet.se/~afb/SDL-1.2.9-classic.patch
I couldn't get the old CW5 projects to build without a few
modifications - such as deleting the stray old header in:
"CWprojects/Support/Carbon/Include/ConditionalMacros.h" ?
But I updated both projects to CW6 too and built for Carbon,
and it ran all of the Mac test projects without any problems.
The MPW file seems to have compiled, with a small order change.
As long as you're still shipping the CWProjects and MPWmake
with the download, they should probably be updated/fixed ?
(another "solution" would of course be to just delete them)
I'll post my new projects along with the new Xcode projects
later on, along with XML exports of the various .mcp files.
(CW5 builds for Classic / "PPC", and CW6 builds for Carbon)
It'll be packaged as a part of the next SpriteWorld X release...
http://spriteworldx.sourceforge.net/ [Classic/Carbon/Win/X11]
--anders
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Thu, 08 Sep 2005 06:34:28 +0000 |
| parents | b8d311d90021 |
| children | 09bc22169702 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
769
b8d311d90021
Updated copyright information for 2004 (Happy New Year!)
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
3 Copyright (C) 1997-2004 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Library General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Library General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Library General Public | |
| 16 License along with this library; if not, write to the Free | |
| 17 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 18 | |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 #ifdef SAVE_RCSID | |
| 24 static char rcsid = | |
| 25 "@(#) $Id$"; | |
| 26 #endif | |
| 27 | |
| 28 /* Win32 thread management routines for SDL */ | |
| 29 | |
| 30 #include <stdio.h> | |
| 31 #include <stdlib.h> | |
| 32 #include <windows.h> | |
| 33 | |
| 34 #include "SDL_error.h" | |
| 35 #include "SDL_thread.h" | |
| 36 #include "SDL_systhread.h" | |
| 37 | |
| 38 | |
| 39 static DWORD WINAPI RunThread(LPVOID data) | |
| 40 { | |
| 41 SDL_RunThread(data); | |
| 42 return(0); | |
| 43 } | |
| 44 | |
| 45 int SDL_SYS_CreateThread(SDL_Thread *thread, void *args) | |
| 46 { | |
| 47 DWORD threadnum; | |
| 48 | |
| 49 thread->handle = CreateThread(NULL, 0, RunThread, args, 0, &threadnum); | |
| 50 if (thread->handle == NULL) { | |
| 51 SDL_SetError("Not enough resources to create thread"); | |
| 52 return(-1); | |
| 53 } | |
| 54 return(0); | |
| 55 } | |
| 56 | |
| 57 void SDL_SYS_SetupThread(void) | |
| 58 { | |
| 59 return; | |
| 60 } | |
| 61 | |
| 62 Uint32 SDL_ThreadID(void) | |
| 63 { | |
| 64 return((Uint32)GetCurrentThreadId()); | |
| 65 } | |
| 66 | |
| 67 void SDL_SYS_WaitThread(SDL_Thread *thread) | |
| 68 { | |
| 69 WaitForSingleObject(thread->handle, INFINITE); | |
| 70 CloseHandle(thread->handle); | |
| 71 } | |
| 72 | |
| 73 /* WARNING: This function is really a last resort. | |
| 74 * Threads should be signaled and then exit by themselves. | |
| 75 * TerminateThread() doesn't perform stack and DLL cleanup. | |
| 76 */ | |
| 77 void SDL_SYS_KillThread(SDL_Thread *thread) | |
| 78 { | |
| 79 TerminateThread(thread->handle, FALSE); | |
| 80 } |