(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.

1 files changed, 0 insertions, 36 deletions

diff --git a/yapf/yapf_node_road.hpp b/yapf/yapf_node_road.hpp
deleted file mode 100644
index dc6f1be3a..000000000
--- a/yapf/yapf_node_road.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $Id$ */
-
-#ifndef  YAPF_NODE_ROAD_HPP
-#define  YAPF_NODE_ROAD_HPP
-
-
-
-/** Yapf Node for road YAPF */
-template <class Tkey_>
-struct CYapfRoadNodeT
-	: CYapfNodeT<Tkey_, CYapfRoadNodeT<Tkey_> >
-{
-	typedef CYapfNodeT<Tkey_, CYapfRoadNodeT<Tkey_> > base;
-
-	TileIndex       m_segment_last_tile;
-	Trackdir        m_segment_last_td;
-
-	void Set(CYapfRoadNodeT* parent, TileIndex tile, Trackdir td, bool is_choice)
-	{
-		base::Set(parent, tile, td, is_choice);
-		m_segment_last_tile = tile;
-		m_segment_last_td = td;
-	}
-};
-
-// now define two major node types (that differ by key type)
-typedef CYapfRoadNodeT<CYapfNodeKeyExitDir>  CYapfRoadNodeExitDir;
-typedef CYapfRoadNodeT<CYapfNodeKeyTrackDir> CYapfRoadNodeTrackDir;
-
-// Default NodeList types
-typedef CNodeList_HashTableT<CYapfRoadNodeExitDir , 8, 12> CRoadNodeListExitDir;
-typedef CNodeList_HashTableT<CYapfRoadNodeTrackDir, 10, 14> CRoadNodeListTrackDir;
-
-
-
-#endif /* YAPF_NODE_ROAD_HPP */