Fixed thread callback calling conventions, updated OS/2 DLL name to SDL12.dll
authorSam Lantinga <slouken@libsdl.org>
Wed, 17 May 2006 18:57:04 +0000
changeset 1850d5d3a6fe05a1
parent 1849 b5a4ac87b98c
child 1851 536b0704b7d8
Fixed thread callback calling conventions, updated OS/2 DLL name to SDL12.dll
README.OS2
Watcom-OS2.zip
include/SDL_thread.h
src/timer/os2/SDL_systimer.c
     1.1 --- a/README.OS2	Wed May 17 15:08:46 2006 +0000
     1.2 +++ b/README.OS2	Wed May 17 18:57:04 2006 +0000
     1.3 @@ -3,7 +3,7 @@
     1.4  SDL on OS/2
     1.5  ===========
     1.6  
     1.7 -Last updated on May. 1, 2006.
     1.8 +Last updated on May. 17, 2006.
     1.9  
    1.10  
    1.11  1. How to compile?
    1.12 @@ -13,8 +13,6 @@
    1.13  - The OS/2 Developer's Toolkit
    1.14  - The OpenWatcom compiler 
    1.15    (http://www.openwatcom.org)
    1.16 -- The FSLib library
    1.17 -  (ftp://ftp.netlabs.org/pub/SDL)
    1.18  
    1.19  First of all, you have to unzip the Watcom-OS2.zip file. This will result in a 
    1.20  file called "makefile" and a file called "setvars.cmd" in this folder (and some
    1.21 @@ -32,7 +30,7 @@
    1.22  for debugging.
    1.23  
    1.24  Then run "wmake".
    1.25 -This should create the SDL.DLL and the corresponding SDL.LIB file here.
    1.26 +This should create the SDL12.DLL and the corresponding SDL12.LIB file here.
    1.27  
    1.28  To test applications, it's a good idea to use the 'debug' build of SDL, and
    1.29  redirect the standard output and standard error output to files, to see what
    1.30 @@ -48,8 +46,8 @@
    1.31  2. How to compile the testapps?
    1.32  -------------------------------
    1.33  
    1.34 -Once you have SDL.DLL compiled, navigate into the 'test' folder, copy in there
    1.35 -the newly built SDL.DLL, and copy in there FSLib.DLL.
    1.36 +Once you have SDL12.DLL compiled, navigate into the 'test' folder, copy in 
    1.37 +there the newly built SDL12.DLL, and copy in there FSLib.DLL.
    1.38  
    1.39  Then run "wmake" in there to compile some of the testapps.
    1.40  
    1.41 @@ -191,6 +189,10 @@
    1.42  10. Changelog of the OS/2 port
    1.43  ------------------------------
    1.44  
    1.45 +Version 1.2.10 - 2006-05-17  - Doodle
    1.46 + - Small modifications for v1.2.10 release
    1.47 + - Changed DLL name to include version info (currently SDL12.dll)
    1.48 +
    1.49  Version 1.2 - 2006-05-01  - Doodle
    1.50   - Modified makefile system to have only one makefile
    1.51   - Included FSLib headers, DLL and LIB file
    1.52 @@ -216,7 +218,7 @@
    1.53      SET SDL_USE_PROPORTIONAL_WINDOW=1
    1.54      dosbox.exe
    1.55     )
    1.56 -   or, if you have the HOME environment variable set, then SDL.DLL will
    1.57 +   or, if you have the HOME environment variable set, then SDL12.DLL will
    1.58     create a file in that directory called .sdl.proportionals, and you can
    1.59     put there the name of executable files that will be automatically made
    1.60     proportional.
     2.1 Binary file Watcom-OS2.zip has changed
     3.1 --- a/include/SDL_thread.h	Wed May 17 15:08:46 2006 +0000
     3.2 +++ b/include/SDL_thread.h	Wed May 17 18:57:04 2006 +0000
     3.3 @@ -79,7 +79,7 @@
     3.4  typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
     3.5  #endif
     3.6  
     3.7 -extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (*fn)(void *), void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread);
     3.8 +extern DECLSPEC SDL_Thread * SDLCALL SDL_CreateThread(int (SDLCALL *fn)(void *), void *data, pfnSDL_CurrentBeginThread pfnBeginThread, pfnSDL_CurrentEndThread pfnEndThread);
     3.9  
    3.10  #ifdef __OS2__
    3.11  #define SDL_CreateThread(fn, data) SDL_CreateThread(fn, data, _beginthread, _endthread)
     4.1 --- a/src/timer/os2/SDL_systimer.c	Wed May 17 15:08:46 2006 +0000
     4.2 +++ b/src/timer/os2/SDL_systimer.c	Wed May 17 18:57:04 2006 +0000
     4.3 @@ -182,7 +182,7 @@
     4.4  static int timer_alive = 0;
     4.5  static SDL_Thread *timer = NULL;
     4.6  
     4.7 -static int RunTimer(void *unused)
     4.8 +static int SDLCALL RunTimer(void *unused)
     4.9  {
    4.10          DosSetPriority(PRTYS_THREAD, PRTYC_TIMECRITICAL, 0, 0);
    4.11          while ( timer_alive ) {