(svn r980) Fixed issues where MorphOS would get problems if AmigaOS would get a port, since MorphOS also have the flag __AMIGA__ defined (Tokai)
--- a/Makefile Wed Dec 08 15:46:13 2004 +0000
+++ b/Makefile Wed Dec 08 16:27:54 2004 +0000
@@ -310,7 +310,7 @@
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
ifdef MORPHOS
-BASECFLAGS += -O2 -funroll-loops -fexpensive-optimizations -mstring -mmultiple $(WARNING_DISPLAY)
+BASECFLAGS += -O3 -funroll-loops -fexpensive-optimizations -mstring -mmultiple $(WARNING_DISPLAY)
else
BASECFLAGS += -O2 $(WARNING_DISPLAY)
endif
--- a/intro_gui.c Wed Dec 08 15:46:13 2004 +0000
+++ b/intro_gui.c Wed Dec 08 16:27:54 2004 +0000
@@ -198,6 +198,8 @@
SetDParam(0, STR_OSNAME_BEOS);
#elif defined(__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
SetDParam(0, STR_0134_UNIX);
#endif
--- a/lang/english.txt Wed Dec 08 15:46:13 2004 +0000
+++ b/lang/english.txt Wed Dec 08 16:27:54 2004 +0000
@@ -310,6 +310,7 @@
STR_0135_OSX :OS X
STR_OSNAME_BEOS :BeOS
STR_OSNAME_MORPHOS :MorphOS
+STR_OSNAME_AMIGAOS :AmigaOS
STR_0139_IMPERIAL_MILES :Imperial (miles)
STR_013A_METRIC_KILOMETERS :Metric (kilometers)
--- a/stdafx.h Wed Dec 08 15:46:13 2004 +0000
+++ b/stdafx.h Wed Dec 08 16:27:54 2004 +0000
@@ -182,4 +182,9 @@
#define CloseConnection OTTD_CloseConnection
#endif
+#if !(defined(__AMIGA__) && !defined(__MORPHOS__))
+// it seems AmigaOS already have a Point declared
+#define Point OTTD_AMIGA_POINT
+#endif
+
#endif // !defined(_STDAFX_H)
--- a/unix.c Wed Dec 08 15:46:13 2004 +0000
+++ b/unix.c Wed Dec 08 16:27:54 2004 +0000
@@ -351,8 +351,8 @@
const DriverDesc _music_driver_descs[] = {
#ifndef __BEOS__
-#ifndef __MORPHOS__
-// MorphOS have no music support
+#if !defined(__MORPHOS__) && !defined(__AMIGA__)
+// MorphOS and AmigaOS have no music support
{"extmidi", "External MIDI Driver", &_extmidi_music_driver, EXTMIDI_PRI},
#endif
#endif