--- a/Makefile Fri Jun 22 22:15:49 2007 +0000
+++ b/Makefile Sun Jun 24 18:26:50 2007 +0000
@@ -843,8 +843,12 @@
SRCS += sound/win32_s.c
SRCS += video/win32_v.c
else
- SRCS += unix.c
- SRCS += music/extmidi.c
+ ifdef OS2
+ SRCS += os2.c
+ else
+ SRCS += unix.c
+ SRCS += music/extmidi.c
+ endif
endif
ifdef OSX
--- a/docs/Readme_OS2.txt Fri Jun 22 22:15:49 2007 +0000
+++ b/docs/Readme_OS2.txt Sun Jun 24 18:26:50 2007 +0000
@@ -50,6 +50,9 @@
If I hear enough responses that both music and sound work together (it might
just be my system), I'll have the defaults changed.
+Please note also that the GCC version does not currently support the MCI MIDI
+system.
+
A NOTE ABOUT DEDICATED MULTIPLAYER SERVERS
------------------------------------------
@@ -74,9 +77,17 @@
http://www.mozilla.org/ports/os2/gccsetup.html
+Alternatively, Paul Smedley's ready-to-go GCC build environment has been known to
+successfully build the game:
+
+ http://www.smedley.info/os2ports/index.php?page=build-environment
+
To build, you should, if your environment is set up well enough, be able to just
type `./configure' (or `sh configure' if you're using the OS/2 shell) and `make'.
+You may have to manually specify `--os OS2' on the configure command line, as
+configure cannot currently detect OS/2 manually.
+
A note on Open Watcom
---------------------
@@ -122,4 +133,4 @@
Thanks to Paul Smedley for his help with getting OpenTTD to compile under GCC on OS/2.
-- Owen Rudge, 8th January 2007
+- Owen Rudge, 24th June 2007
--- a/driver.c Fri Jun 22 22:15:49 2007 +0000
+++ b/driver.c Sun Jun 24 18:26:50 2007 +0000
@@ -58,7 +58,7 @@
M("qt", "QuickTime MIDI Driver", &_qtime_music_driver),
#endif
#ifdef UNIX
-#if !defined(__MORPHOS__) && !defined(__AMIGA__)
+#if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(__OS2__)
M("extmidi", "External MIDI Driver", &_extmidi_music_driver),
#endif
#endif
--- a/os2.c Fri Jun 22 22:15:49 2007 +0000
+++ b/os2.c Sun Jun 24 18:26:50 2007 +0000
@@ -134,7 +134,7 @@
}
}
-void ShowInfo(const unsigned char *str)
+void ShowInfo(const char *str)
{
HAB hab;
HMQ hmq;