From 23c4b2f6c7a9296b3e3cbe410dd0f034d9cc77ed 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 --- 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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