cpp/openttd-patchpack/source Changeset - r569:9a512d458f7a

Changeset - r569:9a512d458f7a

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

bjarni - 20 years ago 2004-12-08 16:27:54
bjarni@openttd.org

(svn r980) Fixed issues where MorphOS would get problems if AmigaOS would get a port, since MorphOS also have the flag __AMIGA__ defined (Tokai)

5 files changed with 11 insertions and 3 deletions:

Makefile

intro_gui.c

lang/english.txt

stdafx.h

unix.c

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -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)
 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

intro_gui.c

➞

Show inline comments

@@ @@ -198,6 +198,8 @@ static void AskAbandonGameWndProc(Window @@
 		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

lang/english.txt

➞

Show inline comments

@@ @@ -310,6 +310,7 @@ STR_0134_UNIX :Unix @@
 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)

stdafx.h

➞

Show inline comments

@@ @@ -182,4 +182,9 @@ assert_compile(sizeof(uint8) == 1); @@
 #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)

unix.c

➞

Show inline comments

@@ @@ -351,8 +351,8 @@ const DriverDesc _sound_driver_descs[] = @@
 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

0 comments (0 inline, 0 general)