(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, 163 deletions

diff --git a/bridge_map.h b/bridge_map.h
deleted file mode 100644
index 1cda0da9d..000000000
--- a/bridge_map.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* $Id$ */
-
-#ifndef BRIDGE_MAP_H
-#define BRIDGE_MAP_H
-
-#include "direction.h"
-#include "macros.h"
-#include "map.h"
-#include "rail.h"
-#include "road_map.h"
-#include "tile.h"
-
-
-void DrawBridgeMiddle(const TileInfo* ti); // XXX
-
-
-static inline bool IsBridge(TileIndex t)
-{
-	assert(IsTileType(t, MP_TUNNELBRIDGE));
-	return HASBIT(_m[t].m5, 7);
-}
-
-static inline bool IsBridgeTile(TileIndex t)
-{
-	return IsTileType(t, MP_TUNNELBRIDGE) && IsBridge(t);
-}
-
-
-static inline bool MayHaveBridgeAbove(TileIndex t)
-{
-	return
-		IsTileType(t, MP_CLEAR) ||
-		IsTileType(t, MP_RAILWAY) ||
-		IsTileType(t, MP_STREET) ||
-		IsTileType(t, MP_WATER) ||
-		IsTileType(t, MP_TUNNELBRIDGE) ||
-		IsTileType(t, MP_UNMOVABLE);
-}
-
-
-static inline bool IsBridgeAbove(TileIndex t)
-{
-	assert(MayHaveBridgeAbove(t));
-	return GB(_m[t].extra, 6, 2) != 0;
-}
-
-
-/**
- * Determines the type of bridge on a tile
- * @param tile The tile to analyze
- * @return The bridge type
- */
-static inline uint GetBridgeType(TileIndex t)
-{
-	assert(IsBridgeTile(t));
-	return GB(_m[t].m2, 4, 4);
-}
-
-
-/**
- * Get the direction pointing onto the bridge
- */
-static inline DiagDirection GetBridgeRampDirection(TileIndex t)
-{
-	assert(IsBridgeTile(t));
-	return (DiagDirection)GB(_m[t].m5, 0, 2);
-}
-
-
-static inline Axis GetBridgeAxis(TileIndex t)
-{
-	assert(IsBridgeAbove(t));
-	return (Axis)(GB(_m[t].extra, 6, 2) - 1);
-}
-
-
-static inline TransportType GetBridgeTransportType(TileIndex t)
-{
-	assert(IsBridgeTile(t));
-	return (TransportType)GB(_m[t].m5, 2, 2);
-}
-
-
-static inline bool HasBridgeSnowOrDesert(TileIndex t)
-{
-	assert(IsBridgeTile(t));
-	return HASBIT(_m[t].m4, 7);
-}
-
-
-static inline void SetBridgeSnowOrDesert(TileIndex t, bool snow_or_desert)
-{
-	assert(IsBridgeTile(t));
-	SB(_m[t].m4, 7, 1, snow_or_desert);
-}
-
-/**
- * Finds the end of a bridge in the specified direction starting at a middle tile
- */
-TileIndex GetBridgeEnd(TileIndex, DiagDirection);
-
-/**
- * Finds the northern end of a bridge starting at a middle tile
- */
-TileIndex GetNorthernBridgeEnd(TileIndex t);
-
-/**
- * Finds the southern end of a bridge starting at a middle tile
- */
-TileIndex GetSouthernBridgeEnd(TileIndex t);
-
-
-/**
- * Starting at one bridge end finds the other bridge end
- */
-TileIndex GetOtherBridgeEnd(TileIndex);
-
-uint GetBridgeHeight(TileIndex tile);
-uint GetBridgeFoundation(Slope tileh, Axis axis);
-
-static inline void ClearSingleBridgeMiddle(TileIndex t, Axis a)
-{
-	assert(MayHaveBridgeAbove(t));
-	CLRBIT(_m[t].extra, 6 + a);
-}
-
-
-static inline void ClearBridgeMiddle(TileIndex t)
-{
-	ClearSingleBridgeMiddle(t, AXIS_X);
-	ClearSingleBridgeMiddle(t, AXIS_Y);
-}
-
-static inline void SetBridgeMiddle(TileIndex t, Axis a)
-{
-	assert(MayHaveBridgeAbove(t));
-	SETBIT(_m[t].extra, 6 + a);
-}
-
-
-static inline void MakeBridgeRamp(TileIndex t, Owner o, uint bridgetype, DiagDirection d, TransportType tt)
-{
-	SetTileType(t, MP_TUNNELBRIDGE);
-	SetTileOwner(t, o);
-	_m[t].m2 = bridgetype << 4;
-	_m[t].m4 = 0;
-	_m[t].m5 = 1 << 7 | tt << 2 | d;
-}
-
-static inline void MakeRoadBridgeRamp(TileIndex t, Owner o, uint bridgetype, DiagDirection d)
-{
-	MakeBridgeRamp(t, o, bridgetype, d, TRANSPORT_ROAD);
-	_m[t].m3 = 0;
-}
-
-static inline void MakeRailBridgeRamp(TileIndex t, Owner o, uint bridgetype, DiagDirection d, RailType r)
-{
-	MakeBridgeRamp(t, o, bridgetype, d, TRANSPORT_RAIL);
-	_m[t].m3 = r;
-}
-
-
-#endif /* BRIDGE_MAP_H */