cpp/openttd-patchpack/source Changeset - r1524:1fcae7f9f80e

Changeset - r1524:1fcae7f9f80e

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

celestar - 19 years ago 2005-03-19 22:36:13
celestar@openttd.org

(svn r2028) Added detection of SVN version (rev.c generation) for OS/2, updated readme, initial clipboard support (orudge)

4 files changed with 252 insertions and 189 deletions:

docs/Readme_OS2.txt

openttd.tgt

204

177

os/os2/openttd.wpj

os2.c

0 comments (0 inline, 0 general)

docs/Readme_OS2.txt

➞

Show inline comments

@@ @@ -66,13 +66,14 @@ Compiler @@
 Open Watcom 1.3 was used to build OpenTTD (earlier versions will
 NOT work). See http://www.openwatcom.org/ to download it. It may
-also be possible to build OpenTTD under OS/2: I attempted this
+also be possible to build OpenTTD with GCC: I attempted this
 before using Open Watcom, but found the tools available for OS/2
 at the time to be a bit more tricky to get working.
 Due to complexities in my set-up, I actually used the Win32 version
 of Open Watcom to initially compile OpenTTD for OS/2. There should
 be no reason of course why the OS/2 version cannot be used.
 be no reason of course why the OS/2 version cannot be used, and I
 have subsequently built OpenTTD successfully this way.
 Libraries Required
 ------------------
@@ @@ -84,10 +85,10 @@ provided, they are not designed for Watc @@
 - zlib
   http://www.zlib.org/ - contains a makefile for OS/2, but is out
   of date and uses EMX
+  of date and uses EMX, ignore this
 - libpng
   http://www.libpng.org/ - contains an EMX/gcc makefile
+  http://www.libpng.org/ - contains an EMX/gcc makefile, ignore this
 - SDL for OS/2
   For 0.3.5, I used ftp://ftp.netlabs.org/pub/sdl/SDL-1.2.7-src-20040908a.zip -
@@ @@ -98,6 +99,24 @@ If you do not wish to build the librarie @@
 can be downloaded from the Files section at
 http://sourceforge.net/projects/openttd/ - see "os2-useful.zip".
 A Note About Subversion Revision Numbers
 ----------------------------------------
 The project file uses a bit of a hack to find out the SVN revision number and
 create an appropriate rev.c file. It does this using a batch file and a GNU
 makefile, as well as the SVN tools (specifically, "svnversion"). For this to
 work successfully, you'll need the SVN tools installed and in your path, as
 well as some of the GNU tools (GNU make, and some tools from textutils,
 possibly others too) - otherwise, a generic rev.c with the revision set to
 "norev000" will be created. To specifically force a version number, set
 the environment variable "RELEASE" to the number (eg, "0.3.6") -before-
 starting the Open Watcom IDE (which must be launched from the same shell
 session). Also, beware, as you WILL cause incompatibilities if you try to
 play a multiplayer game with a different version.
 Apologies for the complicated hack used here, but it's a bit of a pain to do,
 as any Windows MSVC user will tell you. ;)
 Compiling
 ---------
@@ @@ -115,4 +134,4 @@ If you have any questions regarding OS/2 @@
 (owen@owenrudge.net) and I'll try to help you out. For general OpenTTD
 issues, see the Contacting section of readme.txt.
-- Owen Rudge, 26th December 2004
 - Owen Rudge

openttd.tgt

➞

Show inline comments

@@ @@ -194,7 +194,7 @@ 1 @@
 WPickList
 MItem
@@ @@ -339,8 +339,8 @@ 23 @@
 WString
 ENABLE_NETWORK=1 WITH_ZLIB=1 WITH_PNG=1 WITH_SDL=1
 ENABLE_NETWORK=1 WITH_ZLIB=1 WITH_PNG=1 WITH_SDL=1 WITH_REV=1
 MCState
@@ @@ -1545,8 +1545,8 @@ 1 @@
 MItem
 road_cmd.c
 rev.c
 WString
@@ @@ -1556,689 +1556,716 @@ WVList @@
 WVList
 MItem
 road_gui.c
 ActionStates
 WString
 COBJ
 &Make
 WVList
 WVList
 MItem
 roadveh_cmd.c
 road_cmd.c
 WString
 COBJ
 WVList
 WVList
 MItem
 roadveh_gui.c
 road_gui.c
 WString
 COBJ
 WVList
 WVList
 MItem
 roadveh_cmd.c
 WString
 COBJ
 WVList
 WVList
 MItem
 saveload.c
 roadveh_gui.c
 WString
 COBJ
 WVList
 WVList
 MItem
 screenshot.c
 saveload.c
 WString
 COBJ
 WVList
 WVList
 MItem
 sdl.c
 screenshot.c
 WString
 COBJ
 WVList
 WVList
 MItem
 settings.c
 sdl.c
 WString
 COBJ
 WVList
 WVList
 MItem
 settings_gui.c
 settings.c
 WString
 COBJ
 WVList
 WVList
 MItem
 settings_gui.c
 WString
 COBJ
 WVList
 WVList
 MItem
 ship_cmd.c
 WString
 COBJ
 WVList
 WVList
 MItem
 ship_gui.c
 WString
 COBJ
 WVList
 WVList
 MItem
 signs.c
 WString
 COBJ
 WVList
 WVList
 MItem
 smallmap_gui.c
 WString
 COBJ
 WVList
 WVList
 MItem
 sound.c
 WString
 COBJ
 WVList
 WVList
 MItem
 sprite.c
 WString
 COBJ
 WVList
 WVList
 MItem
 spritecache.c
 WString
 COBJ
 WVList
 WVList
 MItem
 station_cmd.c
 WString
 COBJ
 WVList
 WVList
 MItem
 station_gui.c
 WString
 COBJ
 WVList
 WVList
 MItem
 StdAfx.c
 WString
 COBJ
 WVList
 WVList
 MItem
 string.c
 WString
 COBJ
 WVList
 WVList
 MItem
 strings.c
 WString
 COBJ
 WVList
 WVList
 MItem
 subsidy_gui.c
 WString
 COBJ
 WVList
 WVList
 MItem
 terraform_gui.c
 WString
 COBJ
 WVList
 WVList
 MItem
 texteff.c
 WString
 COBJ
 WVList
 WVList
 MItem
 tile.c
 WString
 COBJ
 WVList
 WVList
 MItem
 town_cmd.c
 WString
 COBJ
 WVList
 WVList
 MItem
 town_gui.c
 WString
 COBJ
 WVList
 WVList
 MItem
 train_cmd.c
 WString
 COBJ
 WVList
 WVList
 MItem
 train_gui.c
 WString
 COBJ
 WVList
 WVList
 MItem
 tree_cmd.c
 WString
 COBJ
 WVList
 WVList
 MItem
 ttd.c
 WString
 COBJ
 WVList
 WVList
 MItem
 tunnelbridge_cmd.c
 WString
 COBJ
 WVList
 WVList
 MItem
 unmovable_cmd.c
 WString
 COBJ
 WVList
 WVList
 MItem
 vehicle.c
 WString
 COBJ
 WVList
 WVList
 MItem
 vehicle_gui.c
 WString
 COBJ
 WVList
 WVList
 MItem
 viewport.c
 WString
 COBJ
 WVList
 WVList
 MItem
 water_cmd.c
 WString
 COBJ
 WVList
 WVList
 MItem
 widget.c
 WString
 COBJ
 WVList
 WVList
 MItem
 window.c
 WString
 COBJ
 WVList
 WVList

os/os2/openttd.wpj

➞

Show inline comments

@@ @@ -4,15 +4,16 @@ 0 @@
 VpeMain
 WRect
 -32
 -40
 MProject
 MCommand
 svn_version.cmd
 MCommand
@@ @@ -42,8 +43,8 @@ 10 @@
 WFileName
 ..\..\openttd.tgt
 VComponent

os2.c

➞

Show inline comments

@@ @@ -15,6 +15,7 @@ @@
 #define INCL_DOS
 #define INCL_OS2MM
 #define INCL_WIN
 #define INCL_WINCLIPBOARD
 #include <os2.h>
 #include <os2me.h>
@@ @@ -687,6 +688,21 @@ const HalMusicDriver _os2_music_driver = @@
 bool InsertTextBufferClipboard(Textbuf *tb)
+{
 #if 0
 	HAB hab = 0; // anchor-block handle
 	PSZ pszClipText, pszLocalText;
 	if (WinOpenClipbrd(hab))
+	{
 		if (pszClipText = (PSZ) WinQueryClipbrdData(hab, CF_TEXT))
+		{
 			while (*pszLocalText++ = *pszClipText++);
+		}
 		WinCloseClipbrd(hab);
+	}
 	// text is now in pszLocalText, do something with it!
 #endif
 	// TODO
 	return false;
+}

0 comments (0 inline, 0 general)