mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r980) Fixed issues where MorphOS would get problems if AmigaOS would get a port, since MorphOS also have the flag __AMIGA__ defined (Tokai)
This commit is contained in:
parent
5b0743d66b
commit
1f31bee5e4
2
Makefile
2
Makefile
|
@ -310,7 +310,7 @@ ifdef OSX
|
||||||
BASECFLAGS += -O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic -mpowerpc-gpopt -force_cpusubtype_ALL $(WARNING_DISPLAY)
|
BASECFLAGS += -O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic -mpowerpc-gpopt -force_cpusubtype_ALL $(WARNING_DISPLAY)
|
||||||
else
|
else
|
||||||
ifdef MORPHOS
|
ifdef MORPHOS
|
||||||
BASECFLAGS += -O2 -funroll-loops -fexpensive-optimizations -mstring -mmultiple $(WARNING_DISPLAY)
|
BASECFLAGS += -O3 -funroll-loops -fexpensive-optimizations -mstring -mmultiple $(WARNING_DISPLAY)
|
||||||
else
|
else
|
||||||
BASECFLAGS += -O2 $(WARNING_DISPLAY)
|
BASECFLAGS += -O2 $(WARNING_DISPLAY)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -198,6 +198,8 @@ static void AskAbandonGameWndProc(Window *w, WindowEvent *e) {
|
||||||
SetDParam(0, STR_OSNAME_BEOS);
|
SetDParam(0, STR_OSNAME_BEOS);
|
||||||
#elif defined(__MORPHOS__)
|
#elif defined(__MORPHOS__)
|
||||||
SetDParam(0, STR_OSNAME_MORPHOS);
|
SetDParam(0, STR_OSNAME_MORPHOS);
|
||||||
|
#elif defined(__AMIGA__) /* note: __AMIGA__ is defined under MorphOS too, so it must be after __MORPHOS__. */
|
||||||
|
SET_DPARAM16(0, STR_OSNAME_AMIGAOS);
|
||||||
#else
|
#else
|
||||||
SetDParam(0, STR_0134_UNIX);
|
SetDParam(0, STR_0134_UNIX);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -310,6 +310,7 @@ STR_0134_UNIX :Unix
|
||||||
STR_0135_OSX :OS X
|
STR_0135_OSX :OS X
|
||||||
STR_OSNAME_BEOS :BeOS
|
STR_OSNAME_BEOS :BeOS
|
||||||
STR_OSNAME_MORPHOS :MorphOS
|
STR_OSNAME_MORPHOS :MorphOS
|
||||||
|
STR_OSNAME_AMIGAOS :AmigaOS
|
||||||
|
|
||||||
STR_0139_IMPERIAL_MILES :Imperial (miles)
|
STR_0139_IMPERIAL_MILES :Imperial (miles)
|
||||||
STR_013A_METRIC_KILOMETERS :Metric (kilometers)
|
STR_013A_METRIC_KILOMETERS :Metric (kilometers)
|
||||||
|
|
5
stdafx.h
5
stdafx.h
|
@ -182,4 +182,9 @@ assert_compile(sizeof(uint8) == 1);
|
||||||
#define CloseConnection OTTD_CloseConnection
|
#define CloseConnection OTTD_CloseConnection
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if !(defined(__AMIGA__) && !defined(__MORPHOS__))
|
||||||
|
// it seems AmigaOS already have a Point declared
|
||||||
|
#define Point OTTD_AMIGA_POINT
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // !defined(_STDAFX_H)
|
#endif // !defined(_STDAFX_H)
|
||||||
|
|
4
unix.c
4
unix.c
|
@ -351,8 +351,8 @@ const DriverDesc _sound_driver_descs[] = {
|
||||||
|
|
||||||
const DriverDesc _music_driver_descs[] = {
|
const DriverDesc _music_driver_descs[] = {
|
||||||
#ifndef __BEOS__
|
#ifndef __BEOS__
|
||||||
#ifndef __MORPHOS__
|
#if !defined(__MORPHOS__) && !defined(__AMIGA__)
|
||||||
// MorphOS have no music support
|
// MorphOS and AmigaOS have no music support
|
||||||
{"extmidi", "External MIDI Driver", &_extmidi_music_driver, EXTMIDI_PRI},
|
{"extmidi", "External MIDI Driver", &_extmidi_music_driver, EXTMIDI_PRI},
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue