From 90a334ec545b5f2db8020bd2ebe51ae0cb0b00f5 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 17 May 2006 18:57:04 +0000 Subject: [PATCH] Fixed thread callback calling conventions, updated OS/2 DLL name to SDL12.dll --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401815 --- README.OS2 | 16 +++++++++------- Watcom-OS2.zip | Bin 63017 -> 63088 bytes include/SDL_thread.h | 2 +- src/timer/os2/SDL_systimer.c | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.OS2 b/README.OS2 index 7e462bf36..424b3739c 100644 --- a/README.OS2 +++ b/README.OS2 @@ -3,7 +3,7 @@ SDL on OS/2 =========== -Last updated on May. 1, 2006. +Last updated on May. 17, 2006. 1. How to compile? @@ -13,8 +13,6 @@ To compile this, you'll need the followings installed: - The OS/2 Developer's Toolkit - The OpenWatcom compiler (http://www.openwatcom.org) -- The FSLib library - (ftp://ftp.netlabs.org/pub/SDL) First of all, you have to unzip the Watcom-OS2.zip file. This will result in a file called "makefile" and a file called "setvars.cmd" in this folder (and some @@ -32,7 +30,7 @@ is full of printf()'s, so if something goes wrong, its output can help a lot for debugging. Then run "wmake". -This should create the SDL.DLL and the corresponding SDL.LIB file here. +This should create the SDL12.DLL and the corresponding SDL12.LIB file here. To test applications, it's a good idea to use the 'debug' build of SDL, and redirect the standard output and standard error output to files, to see what @@ -48,8 +46,8 @@ wmake 2. How to compile the testapps? ------------------------------- -Once you have SDL.DLL compiled, navigate into the 'test' folder, copy in there -the newly built SDL.DLL, and copy in there FSLib.DLL. +Once you have SDL12.DLL compiled, navigate into the 'test' folder, copy in +there the newly built SDL12.DLL, and copy in there FSLib.DLL. Then run "wmake" in there to compile some of the testapps. @@ -191,6 +189,10 @@ please, be our guest and contact us! 10. Changelog of the OS/2 port ------------------------------ +Version 1.2.10 - 2006-05-17 - Doodle + - Small modifications for v1.2.10 release + - Changed DLL name to include version info (currently SDL12.dll) + Version 1.2 - 2006-05-01 - Doodle - Modified makefile system to have only one makefile - Included FSLib headers, DLL and LIB file @@ -216,7 +218,7 @@ Version 1.2.7 - 2005-12-22 - Doodle SET SDL_USE_PROPORTIONAL_WINDOW=1 dosbox.exe ) - or, if you have the HOME environment variable set, then SDL.DLL will + or, if you have the HOME environment variable set, then SDL12.DLL will create a file in that directory called .sdl.proportionals, and you can put there the name of executable files that will be automatically made proportional. diff --git a/Watcom-OS2.zip b/Watcom-OS2.zip index 603210f4b5be271749d4188c5279495be0917c4b..b3d1a67a07e26feb2e68801243f72f078966a796 100644 GIT binary patch delta 3165 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 AIRF3v diff --git a/include/SDL_thread.h b/include/SDL_thread.h index 80746fe38..e0a35b1ab 100644 --- a/include/SDL_thread.h +++ b/include/SDL_thread.h @@ -79,7 +79,7 @@ typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned, typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code); #endif -extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (*fn)(void *), void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread); +extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (SDLCALL *fn)(void *), void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread); #ifdef __OS2__ #define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthread, _endthread) diff --git a/src/timer/os2/SDL_systimer.c b/src/timer/os2/SDL_systimer.c index cba503c7f..825ced973 100644 --- a/src/timer/os2/SDL_systimer.c +++ b/src/timer/os2/SDL_systimer.c @@ -182,7 +182,7 @@ DECLSPEC void SDLCALL SDL_Delay(Uint32 ms) static int timer_alive = 0; static SDL_Thread *timer = NULL; -static int RunTimer(void *unused) +static int SDLCALL RunTimer(void *unused) { DosSetPriority(PRTYS_THREAD, PRTYC_TIMECRITICAL, 0, 0); while ( timer_alive ) {