(svn r7548) -Codechange: Some MorphOS changes to get OpenTTD compiled, packaged (tokai)

4 files changed, 7 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index d5ffa3341..21cbf43ad 100644
--- a/Makefile
+++ b/Makefile
@@ -944,15 +944,17 @@ release: all
 	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/data"
 	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/lang"
 	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/scenario"
+	$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/scenario/heightmap"
 	$(Q)cp -R $(TTD)                      "/t/openttd-$(RELEASE)-morphos/"
 	$(Q)cp data/*                         "/t/openttd-$(RELEASE)-morphos/data/"
 	$(Q)cp lang/*.lng                     "/t/openttd-$(RELEASE)-morphos/lang/"
-	$(Q)cp scenario/*                     "/t/openttd-$(RELEASE)-morphos/scenario/"
+	$(Q)-cp scenario/*.scn                "/t/openttd-$(RELEASE)-morphos/scenario/"
+	$(Q)-cp scenario/heightmap/*          "/t/openttd-$(RELEASE)-morphos/scenario/heightmap/"
 	$(Q)cp readme.txt                     "/t/openttd-$(RELEASE)-morphos/docs/ReadMe"
 	$(Q)cp docs/console.txt               "/t/openttd-$(RELEASE)-morphos/docs/Console"
 	$(Q)cp COPYING                        "/t/openttd-$(RELEASE)-morphos/docs/"
 	$(Q)cp changelog.txt                  "/t/openttd-$(RELEASE)-morphos/docs/ChangeLog"
-	$(Q)cp known-bugs.txt				   "/t/openttd-$(RELEASE)-morphos/docs/known-bugs.txt"
+	$(Q)cp known-bugs.txt                 "/t/openttd-$(RELEASE)-morphos/docs/known-bugs.txt"
 	$(Q)cp os/morphos/icons/openttd.info  "/t/openttd-$(RELEASE)-morphos/$(TTD).info"
 	$(Q)cp os/morphos/icons/docs.info     "/t/openttd-$(RELEASE)-morphos/docs.info"
 	$(Q)cp os/morphos/icons/drawer.info   "/t/openttd-$(RELEASE)-morphos.info"
diff --git a/os_timer.c b/os_timer.c
index efc45c29b..e2a96e8f9 100644
--- a/os_timer.c
+++ b/os_timer.c
@@ -40,7 +40,7 @@ uint64 _rdtsc(void)
 #endif
 
 /* rdtsc for PPC which has this not */
-#if defined(__POWERPC__) && !defined(RDTSC_AVAILABLE)
+#if (defined(__POWERPC__) || defined(__powerpc__)) && !defined(RDTSC_AVAILABLE)
 uint64 _rdtsc(void)
 {
 	uint32 high = 0, high2 = 0, low;
diff --git a/readme.txt b/readme.txt
index 4b5999d98..40bf4a978 100644
--- a/readme.txt
+++ b/readme.txt
@@ -167,7 +167,7 @@ FreeBSD:
 MorphOS:
   Use "make". Note that you need the MorphOS SDK, latest libnix updates (else
   C++ parts of OpenTTD will not build) and the powersdl.library SDK. Optionally
-  libz and libpng developer files.
+  libz, libpng and freetype2 developer files.
 
 OS/2:
   Open Watcom C/C++ 1.3 or later is required to build the OS/2 version. See the
diff --git a/stdafx.h b/stdafx.h
index 5d2d58103..8504e585c 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -196,7 +196,7 @@ typedef unsigned char byte;
 #endif
 
 // This is already defined in unix
-#if !defined(UNIX) && !defined(__CYGWIN__) && !defined(__BEOS__)
+#if !defined(UNIX) && !defined(__CYGWIN__) && !defined(__BEOS__) && !defined(__MORPHOS__)
   typedef unsigned int uint;
 #endif
 // Not defined in QNX Neutrino (6.x)