(svn r7759) -Merge: makefile rewrite. This merge features:

 - A proper ./configure, so everything needs to be configured only once, not for every make.
 - Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
 - A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
 - Proper support for OSX universal binaries.
 - Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
 - Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.

Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.

18 files changed, 43 insertions, 0 deletions

diff --git a/bin/data/2ccmap.grf b/bin/data/2ccmap.grf
new file mode 100644
index 000000000..4e833c0e8
--- /dev/null
+++ b/bin/data/2ccmap.grf
diff --git a/bin/data/airports.grf b/bin/data/airports.grf
new file mode 100644
index 000000000..8c35d18d0
--- /dev/null
+++ b/bin/data/airports.grf
diff --git a/bin/data/autorail.grf b/bin/data/autorail.grf
new file mode 100644
index 000000000..cd6fd293c
--- /dev/null
+++ b/bin/data/autorail.grf
diff --git a/bin/data/canalsw.grf b/bin/data/canalsw.grf
new file mode 100644
index 000000000..045eae15e
--- /dev/null
+++ b/bin/data/canalsw.grf
diff --git a/bin/data/dosdummy.grf b/bin/data/dosdummy.grf
new file mode 100644
index 000000000..6524d5971
--- /dev/null
+++ b/bin/data/dosdummy.grf
diff --git a/bin/data/elrailsw.grf b/bin/data/elrailsw.grf
new file mode 100644
index 000000000..f722d1e3a
--- /dev/null
+++ b/bin/data/elrailsw.grf
diff --git a/bin/data/nsignalsw.grf b/bin/data/nsignalsw.grf
new file mode 100644
index 000000000..03dee7863
--- /dev/null
+++ b/bin/data/nsignalsw.grf
diff --git a/bin/data/openttd.grf b/bin/data/openttd.grf
new file mode 100644
index 000000000..95ec41dbb
--- /dev/null
+++ b/bin/data/openttd.grf
diff --git a/bin/data/opntitle.dat b/bin/data/opntitle.dat
new file mode 100644
index 000000000..70caa9ff8
--- /dev/null
+++ b/bin/data/opntitle.dat
diff --git a/bin/data/trkfoundw.grf b/bin/data/trkfoundw.grf
new file mode 100644
index 000000000..5fbfa36e9
--- /dev/null
+++ b/bin/data/trkfoundw.grf
diff --git a/bin/scenario/README b/bin/scenario/README
new file mode 100644
index 000000000..48e872cc2
--- /dev/null
+++ b/bin/scenario/README
@@ -0,0 +1,4 @@
+You can place you scenarios in this dir.
+
+This file is really here to make the Makefile happy, it should be modified to
+properly handle scenarios (or maybe even not at all...).
diff --git a/bin/scripts/autoexec.scr.example b/bin/scripts/autoexec.scr.example
new file mode 100644
index 000000000..af1b66d21
--- /dev/null
+++ b/bin/scripts/autoexec.scr.example
@@ -0,0 +1,4 @@
+# send chat messages from the console with
+# ] s i love this chat
+#
+alias s "say %!"
\ No newline at end of file
diff --git a/bin/scripts/on_client.scr.example b/bin/scripts/on_client.scr.example
new file mode 100644
index 000000000..5bbd76049
--- /dev/null
+++ b/bin/scripts/on_client.scr.example
@@ -0,0 +1,2 @@
+echo "Setting default network client settings..."
+name = "myname"
diff --git a/bin/scripts/on_dedicated.scr.example b/bin/scripts/on_dedicated.scr.example
new file mode 100644
index 000000000..5465cd797
--- /dev/null
+++ b/bin/scripts/on_dedicated.scr.example
@@ -0,0 +1,4 @@
+echo "Setting dedicated network server settings..."
+# empty the server password
+server_pw = "*"
+server_name = "My example dedicated gameserver"
diff --git a/bin/scripts/on_server.scr.example b/bin/scripts/on_server.scr.example
new file mode 100644
index 000000000..cc799d9e7
--- /dev/null
+++ b/bin/scripts/on_server.scr.example
@@ -0,0 +1,3 @@
+echo "Setting default network server settings..."
+net_sync_freq = 100
+net_frame_freq = 0
diff --git a/bin/scripts/pre_dedicated.scr.example b/bin/scripts/pre_dedicated.scr.example
new file mode 100644
index 000000000..b41ca51d2
--- /dev/null
+++ b/bin/scripts/pre_dedicated.scr.example
@@ -0,0 +1,3 @@
+# set default server port, and have the dedicated server listen on all interfaces
+server_ip = all
+server_port = 3979
diff --git a/bin/scripts/pre_server.scr.example b/bin/scripts/pre_server.scr.example
new file mode 100644
index 000000000..c1b6c822c
--- /dev/null
+++ b/bin/scripts/pre_server.scr.example
@@ -0,0 +1,2 @@
+# set the server port to the default value
+server_port = 3979
diff --git a/bin/scripts/readme.txt b/bin/scripts/readme.txt
new file mode 100644
index 000000000..2927dcdcb
--- /dev/null
+++ b/bin/scripts/readme.txt
@@ -0,0 +1,21 @@
+Scripting
+---------
+
+OpenTTD supports scripts.
+
+local scripts:
+ - 'autoexec.scr' is executed on gamestart [all - use this for custom aliases per ex.]
+
++network scripts:
+   should be used to set client optimization settings:
+ - 'on_client.scr' is executed when you join a server [all clients]
+
+   should be used to set the servers port/ip and/or server optimization settings/patches:
+ - 'pre_server.scr' is executed before the servers tcp stack is started [in-game only]
+ - 'pre_dedicated.scr' is executed before the servers tcp stack is started [dedicated only]
+
+   should be used to set the servers name, password and so on:
+ - 'on_server.scr' is executed after starting a server [dedicated and in-game]
+ - 'on_dedicated.scr' is additionally executed after starting a server [dedicated only]
+
+For examples how a script can look, check the .example examples.