mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/0.6
Darkvater 2006-12-22 15:06:27 +00:00
parent b07b38d873
commit 458eb02678
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -944,15 +944,17 @@ release: all
$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/data" $(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/data"
$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/lang" $(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/lang"
$(Q)mkdir -p "/t/openttd-$(RELEASE)-morphos/scenario" $(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 -R $(TTD) "/t/openttd-$(RELEASE)-morphos/"
$(Q)cp data/* "/t/openttd-$(RELEASE)-morphos/data/" $(Q)cp data/* "/t/openttd-$(RELEASE)-morphos/data/"
$(Q)cp lang/*.lng "/t/openttd-$(RELEASE)-morphos/lang/" $(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 readme.txt "/t/openttd-$(RELEASE)-morphos/docs/ReadMe"
$(Q)cp docs/console.txt "/t/openttd-$(RELEASE)-morphos/docs/Console" $(Q)cp docs/console.txt "/t/openttd-$(RELEASE)-morphos/docs/Console"
$(Q)cp COPYING "/t/openttd-$(RELEASE)-morphos/docs/" $(Q)cp COPYING "/t/openttd-$(RELEASE)-morphos/docs/"
$(Q)cp changelog.txt "/t/openttd-$(RELEASE)-morphos/docs/ChangeLog" $(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/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/docs.info "/t/openttd-$(RELEASE)-morphos/docs.info"
$(Q)cp os/morphos/icons/drawer.info "/t/openttd-$(RELEASE)-morphos.info" $(Q)cp os/morphos/icons/drawer.info "/t/openttd-$(RELEASE)-morphos.info"

2
os_timer.c
View File

@ -40,7 +40,7 @@ uint64 _rdtsc(void)
#endif #endif
/* rdtsc for PPC which has this not */ /* rdtsc for PPC which has this not */
#if defined(__POWERPC__) && !defined(RDTSC_AVAILABLE) #if (defined(__POWERPC__) || defined(__powerpc__)) && !defined(RDTSC_AVAILABLE)
uint64 _rdtsc(void) uint64 _rdtsc(void)
{ {
uint32 high = 0, high2 = 0, low; uint32 high = 0, high2 = 0, low;

2
readme.txt
View File

@ -167,7 +167,7 @@ FreeBSD:
MorphOS: MorphOS:
Use "make". Note that you need the MorphOS SDK, latest libnix updates (else 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 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: OS/2:
Open Watcom C/C++ 1.3 or later is required to build the OS/2 version. See the Open Watcom C/C++ 1.3 or later is required to build the OS/2 version. See the

2
stdafx.h
View File

@ -196,7 +196,7 @@ typedef unsigned char byte;
#endif #endif
// This is already defined in unix // 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; typedef unsigned int uint;
#endif #endif
// Not defined in QNX Neutrino (6.x) // Not defined in QNX Neutrino (6.x)