mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r4207) - Fix: Update OS/2 on 0.4 branch, too

release/0.4
orudge 2006-03-31 16:19:16 +00:00
parent 8a74170da0
commit 05b541f63a
4 changed files with 545 additions and 603 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
docs/Readme_OS2.txt
View File

@ -15,15 +15,13 @@ LIBRARIES REQUIRED FOR END USERS
SDL.DLL (SDL 1.2.7) and FSLib.dll are required to use this program: SDL.DLL (SDL 1.2.7) and FSLib.dll are required to use this program:
these can be downloaded from the Files section at these can be downloaded from the Files section at
http://sourceforge.net/projects/openttd/ - see "os2-useful.zip". http://sourceforge.net/projects/openttd/ - see "os2-useful-v1.1.zip".
(Note that a newer version of SDL is now available at Version 20051222 of SDL or later is required. This can be found at
ftp://ftp.netlabs.org/pub/sdl/sdl-dev-os2-2004-12-22.zip which may http://sdl.netlabs.org/.
help solve some problems).
Please note that SDL release 2005-03-30 does NOT work with OpenTTD, Please note that earlier SDL releases will probably NOT work with
at least in my experience and the experience of a couple of other OpenTTD. If you experience problems with OpenTTD, please check
users. If you experience problems with OpenTTD, please try downgrading your SDL and FSLib.dll versions (both must match).
to SDL 2004-12-22.
Note that to actually play the game, I have found in my own Note that to actually play the game, I have found in my own
experience that a version of the Scitech Display Drivers or its later experience that a version of the Scitech Display Drivers or its later
@ -96,13 +94,12 @@ provided, they are not designed for Watcom (apart from SDL):
http://www.libpng.org/ - contains an EMX/gcc makefile, ignore this http://www.libpng.org/ - contains an EMX/gcc makefile, ignore this
- SDL for OS/2 - SDL for OS/2
For 0.3.5, I used ftp://ftp.netlabs.org/pub/sdl/SDL-1.2.7-src-20040908a.zip - ftp://ftp.netlabs.org/pub/sdl/sdl-1.2.7-src-20051222.zip used for
take SDL.dll and SDL.lib from the src/ directory. Note that 20041222 is 0.4.7
out now, which is recommended for stability updates.
If you do not wish to build the libraries yourself, pre-built versions If you do not wish to build the libraries yourself, pre-built versions
can be downloaded from the Files section at can be downloaded from the Files section at
http://sourceforge.net/projects/openttd/ - see "os2-useful.zip". http://sourceforge.net/projects/openttd/ - see "os2-useful-v1.1.zip".
A Note About Subversion Revision Numbers A Note About Subversion Revision Numbers
---------------------------------------- ----------------------------------------

1115
openttd.tgt
View File

File diff suppressed because it is too large Load Diff

4
os/os2/openttd.wpj
View File

@ -43,8 +43,8 @@ WRect
WFileName WFileName
17 17
..\..\openttd.tgt ..\..\openttd.tgt
0 61
0 63
11 11
VComponent VComponent
12 12

8
strgen/strgen.c
View File

@ -19,6 +19,14 @@
#define stderr stdout #define stderr stdout
#endif // __MORPHOS__ #endif // __MORPHOS__
#ifdef __WATCOMC__
uint _map_log_x; // an unpleasant hack required because Watcom is insisting on
uint _map_size_x; // these variables being valid references in map.h
uint _map_size_y;
uint _map_tile_mask;
uint _map_size;
#endif
/* Compiles a list of strings into a compiled string list */ /* Compiles a list of strings into a compiled string list */
typedef void (*ParseCmdProc)(char *buf, int value); typedef void (*ParseCmdProc)(char *buf, int value);