mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r10307) [0.5] -Fix: Got 0.5 compiling on OS/2 again
This commit is contained in:
parent
e3a245369e
commit
10b6fc898b
8
Makefile
8
Makefile
|
@ -843,8 +843,12 @@ ifdef WIN32
|
|||
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
|
||||
|
|
|
@ -50,6 +50,9 @@ To enable music, start OpenTTD with the command line:
|
|||
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 @@ may help to set one up (although some of the links from that page are broken):
|
|||
|
||||
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 @@ issues, see the Contacting section of readme.txt.
|
|||
|
||||
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
|
||||
|
|
2
driver.c
2
driver.c
|
@ -58,7 +58,7 @@ static const DriverDesc _music_driver_descs[] = {
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue