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

diff --git a/newgrf_engine.h b/newgrf_engine.h
deleted file mode 100644
index bd9ddb230..000000000
--- a/newgrf_engine.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* $Id$ */
-
-#ifndef NEWGRF_ENGINE_H
-#define NEWGRF_ENGINE_H
-
-#include "newgrf.h"
-#include "direction.h"
-#include "newgrf_cargo.h"
-
-/** @file newgrf_engine.h
- */
-
-extern int _traininfo_vehicle_pitch;
-extern int _traininfo_vehicle_width;
-
-extern const CargoID _global_cargo_id[NUM_LANDSCAPE][NUM_CARGO];
-extern const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE];
-extern const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID];
-extern const uint32 cargo_classes[16];
-
-void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const struct SpriteGroup *group, byte *train_id, int trains);
-void SetCustomEngineSprites(EngineID engine, byte cargo, const struct SpriteGroup *group);
-void SetRotorOverrideSprites(EngineID engine, const struct SpriteGroup *group);
-SpriteID GetCustomEngineSprite(EngineID engine, const Vehicle* v, Direction direction);
-SpriteID GetRotorOverrideSprite(EngineID engine, const Vehicle* v, bool info_view);
-#define GetCustomRotorSprite(v, i) GetRotorOverrideSprite(v->engine_type, v, i)
-#define GetCustomRotorIcon(et) GetRotorOverrideSprite(et, NULL, true)
-
-/* Forward declaration of GRFFile, to avoid unnecessary inclusion of newgrf.h
- * elsewhere... */
-struct GRFFile;
-
-void SetEngineGRF(EngineID engine, const struct GRFFile *file);
-const struct GRFFile *GetEngineGRF(EngineID engine);
-uint32 GetEngineGRFID(EngineID engine);
-
-uint16 GetVehicleCallback(uint16 callback, uint32 param1, uint32 param2, EngineID engine, const Vehicle *v);
-uint16 GetVehicleCallbackParent(uint16 callback, uint32 param1, uint32 param2, EngineID engine, const Vehicle *v, const Vehicle *parent);
-bool UsesWagonOverride(const Vehicle *v);
-#define GetCustomVehicleSprite(v, direction) GetCustomEngineSprite(v->engine_type, v, direction)
-#define GetCustomVehicleIcon(et, direction) GetCustomEngineSprite(et, NULL, direction)
-
-typedef enum VehicleTrigger {
-	VEHICLE_TRIGGER_NEW_CARGO     = 1,
-	// Externally triggered only for the first vehicle in chain
-	VEHICLE_TRIGGER_DEPOT         = 2,
-	// Externally triggered only for the first vehicle in chain, only if whole chain is empty
-	VEHICLE_TRIGGER_EMPTY         = 4,
-	// Not triggered externally (called for the whole chain if we got NEW_CARGO)
-	VEHICLE_TRIGGER_ANY_NEW_CARGO = 8,
-} VehicleTrigger;
-void TriggerVehicle(Vehicle *veh, VehicleTrigger trigger);
-
-void SetCustomEngineName(EngineID engine, StringID name);
-StringID GetCustomEngineName(EngineID engine);
-
-void UnloadWagonOverrides(void);
-void UnloadRotorOverrideSprites(void);
-void UnloadCustomEngineSprites(void);
-void UnloadCustomEngineNames(void);
-
-void ResetEngineListOrder(void);
-EngineID GetRailVehAtPosition(EngineID pos);
-uint16 ListPositionOfEngine(EngineID engine);
-void AlterRailVehListOrder(EngineID engine, EngineID target);
-
-#endif /* NEWGRF_ENGINE_H */