diff options
| author | bjarni <bjarni@openttd.org> | 2004-12-22 21:12:36 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2004-12-22 21:12:36 +0000 |
| commit | a92dc63ec90343fbe1b403719882a7f8876f67ba (patch) | |
| tree | 152ac6fd50333783aaad3a27f3e03b5dda93fd45 /stdafx.h | |
| parent | e04e8f53c36fc089b233ebe58252b8e675d58f2f (diff) | |
| download | openttd-a92dc63ec90343fbe1b403719882a7f8876f67ba.tar.xz | |
(svn r1236) MorphOS: added make release like in OSX (tokai)
MorphOS: cleaned up the code telling the difference between AmigaOS and MorphOS (tokai)
Diffstat (limited to 'stdafx.h')
| -rw-r--r-- | stdafx.h | 23 |
1 files changed, 22 insertions, 1 deletions
@@ -32,6 +32,27 @@ #include <alloca.h> #endif +#ifdef __MORPHOS__ +// morphos defines certain amiga defines per default, we undefine them +// here to make the rest of source less messy and more clear what is +// required for morphos and what for amigaos +# ifdef amigaos +# undef amigaos +# endif +# ifdef __amigaos__ +# undef __amigaos__ +# endif +# ifdef __AMIGA__ +# undef __AMIGA__ +# endif +# ifdef AMIGA +# undef AMIGA +# endif +# ifdef amiga +# undef amiga +# endif +#endif /* __MORPHOS__ */ + #define BSWAP32(x) ((((x) >> 24) & 0xFF) | (((x) >> 8) & 0xFF00) | (((x) << 8) & 0xFF0000) | (((x) << 24) & 0xFF000000)) #define BSWAP16(x) ((x) >> 8 | (x) << 8) @@ -182,7 +203,7 @@ assert_compile(sizeof(uint8) == 1); #define CloseConnection OTTD_CloseConnection #endif -#if !(defined(__AMIGA__) && !defined(__MORPHOS__)) +#ifdef __AMIGA__ // it seems AmigaOS already have a Point declared #define Point OTTD_AMIGA_POINT #endif |