--- a/Makefile Sat Dec 30 22:55:31 2006 +0000
+++ b/Makefile Sat Dec 30 23:00:52 2006 +0000
@@ -112,9 +112,6 @@
# OTTD_PPC, OTTD_PPC970, OTTD_i386: compile for target architecture.
# Multiple flags can be used so OTTD_PPC:=1 OTTD_i386:=1 produces the same result as UNIVERSAL_BINARY
#
-# JAGUAR: Crosscompiling for OSX 1.2.8 (codenamed Jaguar). Only works if OSX is defined too. Only works with GCC 4 or newer
-# This can be changed to any PPC version of OSX by changing the ppc flags in Makefile.config
-#
# ENDIAN_FORCE: forces the endian-check to give a certain result. Can be BE, LE or PREPROCESSOR.
# PREPROCESSOR is always used on all OSX targets and will make the preprocessor pick the right endian.
# this means that you don't have to think about endianess when compiling for OSX.
@@ -538,10 +535,8 @@
# iconv is enabled defaultly on OSX >= 10.3
ifdef OSX
- ifndef JAGUAR
- WITH_ICONV=1
- LIBS += -liconv
- endif
+ WITH_ICONV=1
+ LIBS += -liconv
endif
ifdef WITH_ICONV
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/HOWTO_compile_lang_files.txt Sat Dec 30 23:00:52 2006 +0000
@@ -0,0 +1,59 @@
+STRGEN USAGE
+------------
+This guide is only interesting for people who want to alter something
+themselves without access to WT2 (translator2.openttd.org). Please note that
+your compiled language file will only be compatible with the OpenTTD version
+you have downloaded english.txt, the master language file, for. While this is
+not always true, namely when changes in the code have not touched language
+files, your safest bet is to assume this 'limitation'.
+As a first step you need to compile strgen. This is as easy as typing
+'make strgen'. You can also download a precompiled binary from a release,
+nightly, etc.
+strgen takes as argument a txt file and translates it to a lng file, allowing
+it to be used inside OpenTTD. strgen needs the master language file
+english.txt to work. Below are some examples of strgen usage.
+
+EXAMPLES
+--------
+Example 1:
+if you are in the root of your working copy (svn code), you should type
+strgen/strgen -s lang lang/english.txt
+to compile englist.txt into english.lng. It will be placed in the lang dir
+
+Example 2:
+you only have the strgen executable (no working copy) and you want to compile
+a txt file in the same directory. You should type
+./strgen english.txt
+and you will get and english.lng in the same dir
+
+Example 3:
+you have strgen somewhere, english.txt in /usr/openttd/lang and you want the
+resulting language file to go to /tmp. Use
+./strgen -s /usr/openttd/lang -d /tmp english.txt
+
+You can interchange english.txt to whichever language you want to generate a
+.lng file for.
+
+STRGEN COMMAND SWITCHES
+-----------------------
+-v | --version
+strgen will tell what svn revision it was last modified
+
+-t | --todo
+strgen will add <TODO> to any untranslated/missing strings and use the english
+strings while compiling the language file
+
+-w | --warning
+strgen will print any missing strings or wrongly translated (bad format)
+to standard error output(stderr)
+
+-h | --help | -?
+Print out a summarized help message explaining these switches
+
+-s | --source_dir
+strgen will search for the master file english.txt in the directory specified
+by this switch instead of the current directory
+
+-d | --dest_dir
+strgen will put <language>.lng in the directory specified by this switch; if
+no dest_dir is given, output is the same as source_dir
--- a/docs/Howto_compile_lng_files_from_CLI.txt Sat Dec 30 22:55:31 2006 +0000
+++ b/docs/Howto_compile_lng_files_from_CLI.txt Sat Dec 30 23:00:52 2006 +0000
@@ -32,17 +32,3 @@
-w
strgen will print any missing strings to standard error output(stderr)
this will need english.txt to be present
-
-here are a very useful tool for translators:
-http://openttd.rulez.org/
-
-
-HOWTO compile strgen:
-(this should be useless as you can just type make)
-Goto the main dir
-Compile by typing
-gcc strgen/strgen.c -o strgen/strgen -DUNIX
-or if you want it to tell the revision too
-gcc strgen/strgen.c rev.o -o strgen/strgen -DUNIX -DWITH_REV (this is the one the makefile uses)
-
-you now have a program called strgen in the strgen directory
--- a/docs/Manual.txt Sat Dec 30 22:55:31 2006 +0000
+++ b/docs/Manual.txt Sat Dec 30 23:00:52 2006 +0000
@@ -18,7 +18,6 @@
BeOS:
On BeOS, run ./configure and then use jam. There are a variaty of options you can pass to your build tool, these are reported by ./configure.
-
1.2 Installing OpenTTD.
On Windows, insert your "Transport Tycoon Deluxe for Windows 95" disk. You can use a DOS version, but your graphics will be purple. NB: Even if your version of Transport Tycoon Deluxe ran on Windows 95, it may still be the DOS version. Then run the OpenTTD installer.
@@ -58,7 +57,6 @@
2.3 Checkpoint Stations
-
Checkpoint stations (the small blue item in the rail construction window) are small 1x1 stations. They must be built on top of pre-existing track. They do not accept or produce carge of any kind. They exist solely for use as route points. They become useful when dealing with large networks where trains may attempt to route themselves along undesirable or impossible routes. As an alternative to checkpoint stations, you can also direct trains to visit depots along the way. This has the advantage of also servicing the train and hence the train will rarely to never need to depart from its route to be serviced.
2.4 Freeform Rail Laying.
--- a/docs/OSX_why_multiple_applications.txt Sat Dec 30 22:55:31 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-There are currently two different downloads for OSX, one is named osx, while the other one is named osx-jaguar
-
-The reason for this is that Apple added more functionality to 10.3 and to make use of that, it will no longer run on OSX 10.2 (codenamed Jaguar). To make the game useable on Jaguar, then a special download is available, but it will miss the bugfixes/features, that relies on newer functionality.
-
-The general download is a universal binary and should work great on all macs using 10.3.9 or newer, no matter what processor it got. You should at all time avoid the Jaguar Build if possible.
-
-Technically the universal binary is a triple binary because it contains code for 3 CPUs and the CPUs in question are PPC (G3+G4), G5 and Intel. The Jaguar build is only optimised for PPC and other (newer) CPUs will not benefit so much from their advanced features. This is another reason to avoid the Jaguar build. It's generally slower on modern CPUs.
-
-Current list of missing features in the Jaguar build:
--Can't save screenshots or savegames if certain chars are in the filename. This mainly applies to European chars and hits German hard as the month Mär (Mar) can't be saved
--- a/docs/Readme_Mandrake_Linux.txt Sat Dec 30 22:55:31 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-Compiling and developing OpenTTD on MandrakeLinux 10.0 Official
-
-A quick guide to get started with OpenTTD development on Linux.
----------------------------------------------------------------
-
-1.) RPMs:
-
-Most packages that are required for development (like gcc) should already be installed on your box. You will require those RPMs additionally:
-- libsdl1.2-devel-1.2.7-2mdk
-- subversion-1.0.1-1mdk (+ dependencies)
-- libsvn_ra_svn1_0-1.0.1-1mdk
-
-
-2.) Subversion:
-
-To obtain the source code from the subversion server type
- $ svn co svn://svn.openttd.com/openttd/trunk openttd
-from command line to dump the code into the directory 'openttd'.
-
-To update your working copy to the latest revision use
- $ svn update
-Don't worry, your version will be merged with the latest version.
-
-The command
- $ svn diff > mypatch.diff
-creates a patch file (aka diff file) which you can submit to the developers to share your improvements.
-
-You can undo changes to a file with
- $svn revert filename
-
-
-3.) Required data files:
-
-Copy the following files from Transport Tycoon Deluxe to openttd/data/
- sample.cat
- trg1r.grf
- trgcr.grf
- trghr.grf
- trgir.grf
- trgtr.grf
-
-(Alternatively you can use the TTD GRF files from the DOS version: TRG1.GRF, TRGC.GRF, TRGH.GRF, TRGI.GRF, TRGT.GRF. A few minor graphical glitches with the DOS graphics remain. E.g. the autorail button in the rail toolbar doesn't look as nice as with the Windows graphics.)
-
-
-4.) Compiling and running:
-
-Compile OpenTTD with
- $ make
-and run it with
- $ ./ttd
-
-
-5.) Playing the soundtrack:
-
-If you want the original TTD music you need to copy the whole /gm/ directory from Windows. Additionally the TiMidity driver is required:
- TiMidity++-2.12.0-0.pre1.4mdk (+ dependencies)
-To run OpenTTD with music support type
- $ ./ttd -m extmidi
-
-
-X.) Last Update: $Date: 2004-06-01 19:08:09 +0200 (Tue, 01 Jun 2004) $
- Written for revision $Rev: 710 $
--- a/docs/Readme_Windows_MSVC.txt Sat Dec 30 22:55:31 2006 +0000
+++ b/docs/Readme_Windows_MSVC.txt Sat Dec 30 23:00:52 2006 +0000
@@ -1,104 +1,108 @@
-Compiling OpenTTD using Microsoft Visual C++ 6.0
+Compiling OpenTTD using Microsoft Visual C++
+December 28, 2006
+--------------------------------------------
+PLEASE READ THE ENTIRE DOCUMENT BEFORE DOING ANY ACTUAL CHANGES!!
+SUPPORTED MSVC COMPILERS
+------------------------
+OpenTTD includes projects for MSVC 2003.NET and MSVC 2005.NET. Both will
+compile out of the box, providing you have the required libraries/headers;
+which ones, see below. There is no support for VS6, you are therefore
+strongly encouraged to either upgrade to MSVC 2005 Express (free) or use GCC.
+MSVC 2002 probably works as well, but it has not been tested.
-Step 1: Ingredients
-
+1) REQUIRED FILES
+-----------------
+You might already have some of the files already installed, so check before
+downloading; mostly because the DirectX SDK and Platform SDK are about
+500MB each.
Download the following files:
- * Openttd-useful.zip (http://sourceforge.net/project/showfiles.php?group_id=103924&package_id=114307&release_id=228633)
- * DirectX 8.1 SDK (http://neuron.tuke.sk/~mizanin/eng/Dx81sdk-include-lib.rar) (or alternatively the latest DirectX SDK from Microsoft)
- * The February 2003 Microsoft Platform SDK (http://www.microsoft.com/msdownload/platformsdk/sdkupdate/XPSP2FULLInstall.htm) (newer SDK's do not work with MSVC6)
- * afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H) (maybe you not need this)
+ * openttd-useful.zip (http://sf.net/project/showfiles.php?group_id=103924&package_id=114307)
+ * DirectX 8.1 SDK (http://neuron.tuke.sk/~mizanin/eng/Dx81sdk-include-lib.rar) (or alternatively the latest DirectX SDK from Microsoft)
+ * MS Windows Platform SDK (http://www.microsoft.com/downloads/details.aspx?FamilyId=A55B6B43-E24F-4EA3-A93E-40C0EC4F68E5&displaylang=en)
+ * afxres.h (http://www-d0.fnal.gov/d0dist/dist/packages/d0ve/devel/windows/AFXRES.H)
...and of course the newest source from svn://svn.openttd.org/trunk
-You have to have a SVN-client to download the source:
-
- * Command line version (Subversion 1.2.3 Win32 binaries) (http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91)
- * GUI TortoiseSVN (http://tortoisesvn.tigris.org/download.html)
-
-Step 2: Includes and Libraries
-
-Put the newly downloaded files in the VC lib and include directories (Where "C:\Program Files\Microsoft Visual Studio\VC98" is your local location of VC)
-
-
- * zconf.h [useful.zip]
- * zlib.h [useful.zip]
- * png.h [useful.zip]
- * pngconf.h [useful.zip]
- * afxres.h
-
-in
-
- C:\Program Files\Microsoft Visual Studio\VC98\Include
+You need an SVN-client to download the source from subversion:
-and
-
- * zlibstat.lib [useful.zip]
- * libpng.lib [useful.zip]
-
-in
-
- C:\Program Files\Microsoft Visual Studio\VC98\Lib
-
+ * CLI Subversion (http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91)
+ * GUI TortoiseSVN (http://tortoisesvn.tigris.org/download.html)
-Step 3: DirectX SDK
-
-(This should work with the latest DirectX SDK as well.)
-
-There are 2 folder in the compressed file: Include and Lib
+2) INCLUDES AND LIBRARIES
+-------------------------
+Put the newly downloaded files in the VC lib\ and include\ directories; where
+"C:\Program Files\Microsoft Visual Studio 8\VC" is your location of Visual C.
+If you are compiling for an x64 system, use the include\ and lib\ directories
+from the win64/ folder.
-Copy all files from Include folder to
+ * openttd-useful.zip\include\*
+ * afxresh.h
+ to > C:\Program Files\Microsoft Visual Studio 8\VC\Include
-C:\Program Files\Microsoft Visual Studio\VC98\Include
+ * openttd-useful.zip\lib\*
+ to > C:\Program Files\Microsoft Visual Studio 8\VC\Lib
-and all files from Lib folder to
-
-C:\Program Files\Microsoft Visual Studio\VC98\Lib
+Custom directories might be recommended, check 2.2)
-
-You can also make custom directories, which is recommended so you don't overwrite VS6 files, for libraries (.lib) and includes/header files (.h) and add it to the VC paths via:
-
-Tools -> Options -> Directories -> show directories for:
+2.1) INCLUDES AND LIBRARIES - DIRECTX/PLATFORM SDK
+--------------------------------------------------
+Basically the same procedure as with the useful zip file, providing
+you are not using the Microsoft installer. Put the include files in the
+include\ directory and the library files to the Lib\ directory.
-a) include files (the include dir: C:\Program Files\Microsoft Visual Studio\VC98\DirectX 8.1 SDK\include )
-
-b) library files (the lib dir, C:\Program Files\Microsoft Visual Studio\VC98\DirectX 8.1 SDK\lib )
+It is recommended to use custom directories so you don't overwrite any
+default header or library files.
-NOTE: make sure that the directory for the DirectX SDK is the first one in the list, above all others, otherwise compilation will most likely fail!!
+2.2) CUSTOM DIRECTORIES
+-----------------------
+If you have put the above include and/or library files into custom folders,
+MSVC will not find them by default. You need to add these paths to VC through:
-Step 4: TTD Graphics files
+Tools > Options > Projects and Solutions > VC++ Directories > show directories for
+ * Include files: Add the DirectX/Platform SDK include dir you've created
+ * Library files: Add the path to the SDK custom lib dir
+
+NOTE: make sure that the directory for the DirectX SDK is the first one in the
+list, above all others, otherwise compilation will most likely fail!!
+
+3) TTD GRAPHICS FILES
+---------------------
Copy the following files from Transport Tycoon Deluxe to the data folder
- * sample.cat
- * trg1r.grf
- * trgcr.grf
- * trghr.grf
- * trgir.grf
- * trgtr.grf
+ * sample.cat
+ * trg1r.grf
+ * trgcr.grf
+ * trghr.grf
+ * trgir.grf
+ * trgtr.grf
-Step 5: Compiling
-
-Open trunk/openttd.dsw
-
-Build menu > Set active configuration > Select: "openttd - Win32 Release"
-
+4) COMPILING
+------------
+Open trunk/openttd[_vs80].sln
+Set the build mode to 'Release' in
+Build > Configuration manager > Active solution configuration > select "Release"
Compile...
-
-Now it should work, it worked for me :)
-
-From r1319 you can compile branch/map in Debug mode (by Bociusz)
-
-For compiling branch/cargo-packets you have to add cargo.c and .h to this tree's openttd.dsp
+If everything works well the binary should be in trunk/Release/openttd.exe
-If it's not working, and you checked that you using the newest SVN (!) report to Bociusz on IRC (irc://irc.freenode.net/openttd)
+5) EDITING, CHANGING SOURCE CODE
+--------------------------------
+Set the build mode (back to) 'Debug'
+Change the startup project to openttd by right-clicking the 'openttd' project
+in the Solution Explorer and selecting 'Set as Startup Project'. The 'openttd'
+project should now show up bold instead of 'strgen'.
-Go ahead and make that patch! Happy Hacking! :)
+6) PROBLEMS?
+------------
+If compilation fails, double-check that you are using the latest SVN (!)
+source. If it still doesn't work, check in on IRC (irc://irc.oftc.net/openttd),
+to ask about reasons; or just wait. The problem will most likely solve itself
+within a few days as the problem is noticed and fixed.
-Originally written by Dribbel
-
-Project file updating by Bociusz
+An up-to-date version of this README can be found on the wiki:
+http://wiki.openttd.org/index.php/MicrosoftVisualCExpress
\ No newline at end of file
--- a/docs/console.txt Sat Dec 30 22:55:31 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-OPENTTD INGAME CONSOLE DOCUMENTATION
-====================================
-http://wiki.openttd.org/index.php/OpenTTDDevBlackBook
-for detailed information
-
-*** WARNING **
- This document is out of date
-*** WARNING **
-
-HOTKEY: BACKQUOTE (aka tilde, the key left to "1")
-
-COMMANDS:
----------
-
-echo [string]
-echoc [color-code] [string]
-exit
-debug_level [0-9]
-dump_vars [filter]
-help
-list_cmds [filter]
-list_vars [filter]
-printf [formatstring] [var] [var] [var]....
-printfc [color-code] [formatstring] [var] [var] [var]....
-quit
-random
-screenshot ["big"/"no_con"]
-
-VARIABLES:
-----------
-*con_developer
--> true = console debugging info
--> false = no output
-
-*developer
--> 0 = no output
--> 1 = console error output [like command not found]
--> 2 = console error and debug output
-
-*cursor_rate
--> 1-12 = defines the cursor blink interval
-
-
-VARIABLE HANDLING:
-------------------
-
-developer = 0
-developer ++
-
-temp_string = test
-temp_string = "my little"
-
-printf "%s world" temp_string
-
-
----------------------------------------------------
-feel free to add more commands and use this in-game
-console for your debugging / enhancements
--- a/docs/directmusic.txt Sat Dec 30 22:55:31 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-Notes about DirectMusic driver for Win32
-----------------------------------------
-
-If compiling under MinGW32, you require the DirectX 7.0 files for MinGW32, available from
-http://alleg.sourceforge.net/files/dx70_mgw.zip.
-
-If compiling under MSVC 6.0, you require the equivalent for MSVC, available from
-http://alleg.sourceforge.net/files/dx70_min.zip. MSVC 7.0/7.1 include header files that
-are recent enough.
-
-If you do not want to compile the DirectMusic driver, undefine WIN32_ENABLE_DIRECTMUSIC_SUPPORT
-in stdafx.h.
-
-Bugs, etc
----------
-
-- The volume control doesn't work properly. I'll fix this soon.
-
-Owen Rudge
-14th March 2004
--- a/docs/multiplayer.txt Sat Dec 30 22:55:31 2006 +0000
+++ b/docs/multiplayer.txt Sat Dec 30 23:00:52 2006 +0000
@@ -9,7 +9,7 @@
- Type in a game name
- Select the type of game ('LAN/Internet' or 'Internet (advertise)'. With the last one
other people are able to see you online. Else they need your IP and port to join)
- - Click "start game" ,"load game" or "load scenario"
+ - Click "start game", "load game" or "load scenario"
- Start playing
@@ -46,7 +46,7 @@
- Open the console and type in the following command:
- ]connect <ip/host>:<port>#<player-no>
+ connect <ip/host>:<port>#<player-no>
4. Playing Internet-Games
@@ -54,7 +54,9 @@
- Since OpenTTD 0.3.5 the network protocol has been rewritten and is very stable, even over slow connections.
- - Server with a red dot behind it have a different version then you have. You will not be able to join those servers.
+ - Servers with a red dot behind it have a different version then you have. You will not be able to join those servers.
+
+ - Servers with a yellow dot behind it have NewGRFs that you do not have. You will not be able to join those servers.
- It can happen that a connection is that slow, or you have that many clients connected to your server, that your clients start to loose their connection. Some things you can do about it:
@@ -110,3 +112,10 @@
- From 0.3.5, desyncs should not happen anymore
- From 0.3.5, patch-settings are also synced. You can now play without deleting openttd.cfg, and with, for example, extra large trains enabled.
+
+7. Troubleshooting
+------------------
+
+ - My advertised server does not show up in the 'advertised server list' (servers.openttd.org)
+ Run openttd with the '-d net=2' parameter, as this will show whether it receives replies from the master server.
+ If it does not receive replies it is most likely that you need to configure your router to forward the OpenTTD ports 3979 (both TCP and UDP) to the computer that is hosting the game.
--- a/openttd.c Sat Dec 30 22:55:31 2006 +0000
+++ b/openttd.c Sat Dec 30 23:00:52 2006 +0000
@@ -150,7 +150,7 @@
" -e = Start Editor\n"
" -g [savegame] = Start new/save game immediately\n"
" -G seed = Set random seed\n"
- " -n [ip#player:port] = Start networkgame\n"
+ " -n [ip:port#player] = Start networkgame\n"
" -D = Start dedicated server\n"
#if !defined(__MORPHOS__) && !defined(__AMIGA__) && !defined(WIN32)
" -f = Fork into the background (dedicated only)\n"
--- a/os/macosx/Makefile Sat Dec 30 22:55:31 2006 +0000
+++ b/os/macosx/Makefile Sat Dec 30 23:00:52 2006 +0000
@@ -106,9 +106,6 @@
$(OSX_STRIP): $(TTD)
$(Q)$(STRIP) openttd
-ifdef JAGUAR
-JAGUAR_POSTFIX := -jaguar
-endif
# build the bundle. OSX wants to keep apps in bundles, so we will give it one
# the good thing about bundles is that you can keep extra files in them, so we keep lng files and a data dir in it
@@ -136,15 +133,12 @@
$(Q)mkdir -p "OpenTTD $(REV)/scenario"
$(Q)cp -R $(OSXAPP) "OpenTTD $(REV)/"
$(Q)cp docs/OSX_install_instructions.txt "OpenTTD $(REV)/How to install (please read).txt"
- $(Q)cp docs/OSX_why_multiple_applications.txt "OpenTTD $(REV)/why a special Jaguar download.txt"
$(Q)cp readme.txt "OpenTTD $(REV)/docs/"
- $(Q)cp docs/console.txt "OpenTTD $(REV)/docs/"
$(Q)cp COPYING "OpenTTD $(REV)/docs/"
$(Q)cp changelog.txt "OpenTTD $(REV)/docs/"
- $(Q)cp os/macosx/*.webloc "OpenTTD $(REV)"
$(Q)cp known-bugs.txt "OpenTTD $(REV)/known-bugs.txt"
$(Q)cp -R scenario/* "OpenTTD $(REV)/scenario/"
- $(Q)hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(REV)" openttd-"$(REV)"-osx"$(JAGUAR_POSTFIX)".dmg
+ $(Q)hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(REV)" openttd-"$(REV)"-osx.dmg
$(Q)rm -fr "OpenTTD $(REV)"
$(OSX): $(TTD) $(OSX_STRIP) BUILD_OSX_BUNDLE
--- a/os/macosx/Makefile.setup Sat Dec 30 22:55:31 2006 +0000
+++ b/os/macosx/Makefile.setup Sat Dec 30 23:00:52 2006 +0000
@@ -38,6 +38,10 @@
ifeq ($(shell uname), Darwin)
# it's a hardware mac, not crosscompiling
+ ifeq ($(shell uname -r), 6.8)
+ # OSX 10.2.8 uses Darwin 6.8, so we better set JAGUAR so we avoid the stuff that was added in 10.3 or later
+$(error OpenTTD can not run or compile on MacOS X 10.2. 10.3.9 or newer is needed)
+ endif
NATIVE_OSX:=1
endif
@@ -85,26 +89,13 @@
endif
endif
-ifdef JAGUAR
- CFLAGS += -isysroot /Developer/SDKs/MacOSX10.2.8.sdk
- LDFLAGS += -Wl,-syslibroot,/Developer/SDKs/MacOSX10.2.8.sdk
- OTTD_PPC:=1
-endif
-
# setting up flags to make a binary, that fits the system it builds on
ifdef NATIVE_OSX
ifndef UNIVERSAL_BINARY
# we are not crosscompiling for other macs
- ifndef JAGUAR
- # the next line fails if it got whitespace in front of it
+ # the next line fails if it got whitespace in front of it
$(shell $(CC) os/macosx/G5_detector.c -o os/macosx/G5_detector)
- IS_G5:=$(shell os/macosx/G5_detector)
- ifeq ($(shell uname -r), 6.8)
- # OSX 10.2.8 uses Darwin 6.8, so we better set JAGUAR so we avoid the stuff that was added in 10.3 or later
- JAGUAR:=1
- OTTD_PPC:=1
- endif
- endif
+ IS_G5:=$(shell os/macosx/G5_detector)
endif
endif
--- a/readme.txt Sat Dec 30 22:55:31 2006 +0000
+++ b/readme.txt Sat Dec 30 23:00:52 2006 +0000
@@ -35,7 +35,7 @@
---- ----------
The easiest way to contact the OpenTTD team is by submitting bug reports or
posting comments in our forums. You can also chat with us on IRC (#openttd
-on irc.freenode.net).
+on irc.oftc.net).
The OpenTTD homepage is http://www.openttd.org/.
@@ -54,7 +54,7 @@
The Flyspray project page URL is: http://bugs.openttd.org/
Please include the following information in your bug report:
- - OpenTTD version (PLEASE test the latest SVN/daily build)
+ - OpenTTD version (PLEASE test the latest SVN/nightly build)
- Bug details, including instructions how to reproduce it
- Platform and compiler (Win32, Linux, FreeBSD, ...)
- Attach a saved game or a screenshot if possible
@@ -70,13 +70,13 @@
be very difficult to port it to a new platform. The currently working platforms
are:
- BeOS - SDL
- FreeBSD - SDL
- Linux - SDL
- MacOS X (universal) - Cocoa video and sound drivers (SDL works too, but not 100% and not as a universal binary)
- MorphOS - SDL
- OS/2 - SDL
- Windows - Win32 GDI (faster) or SDL
+ BeOS - SDL
+ FreeBSD - SDL
+ Linux - SDL
+ MacOS X (universal) - Cocoa video and sound drivers (SDL works too, but not 100% and not as a universal binary)
+ MorphOS - SDL
+ OS/2 - SDL
+ Windows - Win32 GDI (faster) or SDL
4.0) Running OpenTTD:
@@ -120,7 +120,7 @@
* Use Ctrl to place semaphore signals
* Ctrl-D toggles double mode in the Windows version
* Ingame console. More information at
- http://wiki.openttd.org/index.php/OpenTTDDevBlackBook
+ http://wiki.openttd.org/index.php/Console
6.0) Configuration File:
@@ -149,12 +149,11 @@
Unix:
OpenTTD can be built with GNU "make". On non-GNU systems it's called "gmake".
Note that you need SDL-devel 1.2.5 (or higher) to compile OpenTTD.
- (see also docs/Readme_Mandrake_Linux.txt)
MacOS X:
Use "make" or Xcode (which will then call make for you)
- This will give you a binary for your CPU type (PPC/Intel)
- To make an universal binary type "make FAT_BINARY:=1"
+ This will give you a binary for your CPU type (PPC/Intel)
+ To make a universal binary type "make UNIVERSAL_BINARY:=1"
BeOS:
Use "make".
@@ -272,13 +271,13 @@
Bjarni Corfitzen (Bjarni) - Mac OS X port, coder
Matthijs Kooijman (blathijs) - Pathfinder-guru
Victor Fischer (Celestar) - Programming everywhere you need him to
- Tamás Faragó (Darkvater) - Lead programmer
- Loïc Guilloux (glx) - In training, not yet specialized
+ Tamás Faragó (Darkvater) - Lead programmer
+ Loïc Guilloux (glx) - In training, not yet specialized
Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;)
Kerekes Miham (MiHaMiX) - Maintainer of translator service, and host of nightlies
Peter Nelson (peter1138) - Spiritual descendant from newgrf gods
- Remko Bijker (Rubidium) - Belugas code scrutinizer",
+ Remko Bijker (Rubidium) - Programmer
Christoph Mallon (Tron) - Programmer, code correctness police
Patric Stout (TrueLight) - Programmer, network guru, SVN-repository and website host
@@ -289,18 +288,18 @@
Serge Paquet (vurlix) - Assistant project manager, coder (0.1 - 0.3.3)
Thanks to:
- Josef Drexler - For his great work on TTDPatch.
- Marcin Grzegorczyk - For his TTDPatch work and documentation of TTD internals and graphics (signals and track foundations)
- Matthijs Kooijman (blathijs) - For his many patches, suggestions and major work on maprewrite
- Petr Baudis (pasky) - Many patches, newgrf support, etc.
- Simon Sasburg (HackyKid) - For the many bugfixes he has blessed us with (and future PBS)
- Stefan Meißner (sign_de) - For his work on the console
- Mike Ragsdale - OpenTTD installer
- Cian Duffy (MYOB) - BeOS port / manual writing
- Christian Rosentreter (tokai) - MorphOS / AmigaOS port
- Richard Kempton (richK) - additional airports, initial TGP implementation
- Michael Blunck - For revolutionizing TTD with awesome graphics
- George - Canal graphics
- All Translators - For their support to make OpenTTD a truly international game
- Bug Reporters - Thanks for all bug reports
- Chris Sawyer - For an amazing game!
+ Josef Drexler - For his great work on TTDPatch.
+ Marcin Grzegorczyk - For his TTDPatch work and documentation of TTD internals and graphics (signals and track foundations)
+ Matthijs Kooijman (blathijs) - For his many patches, suggestions and major work on maprewrite
+ Petr Baudis (pasky) - Many patches, newgrf support, etc.
+ Simon Sasburg (HackyKid) - For the many bugfixes he has blessed us with (and future PBS)
+ Stefan Meißner (sign_de) - For his work on the console
+ Mike Ragsdale - OpenTTD installer
+ Cian Duffy (MYOB) - BeOS port / manual writing
+ Christian Rosentreter (tokai) - MorphOS / AmigaOS port
+ Richard Kempton (RichK67) - Additional airports, initial TGP implementation
+ Michael Blunck - For revolutionizing TTD with awesome graphics
+ George - Canal graphics
+ All Translators - For their support to make OpenTTD a truly international game
+ Bug Reporters - Thanks for all bug reports
+ Chris Sawyer - For an amazing game!