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

diff --git a/livery.h b/livery.h
deleted file mode 100644
index 2655dcd48..000000000
--- a/livery.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $Id$ */
-
-#ifndef LIVERY_H
-#define LIVERY_H
-
-
-/* List of different livery schemes. */
-typedef enum LiverySchemes {
-	LS_DEFAULT,
-
-	/* Rail vehicles */
-	LS_STEAM,
-	LS_DIESEL,
-	LS_ELECTRIC,
-	LS_MONORAIL,
-	LS_MAGLEV,
-	LS_DMU,
-	LS_EMU,
-	LS_PASSENGER_WAGON_STEAM,
-	LS_PASSENGER_WAGON_DIESEL,
-	LS_PASSENGER_WAGON_ELECTRIC,
-	LS_FREIGHT_WAGON,
-
-	/* Road vehicles */
-	LS_BUS,
-	LS_TRUCK,
-
-	/* Ships */
-	LS_PASSENGER_SHIP,
-	LS_FREIGHT_SHIP,
-
-	/* Aircraft */
-	LS_HELICOPTER,
-	LS_SMALL_PLANE,
-	LS_LARGE_PLANE,
-
-	LS_END
-} LiveryScheme;
-
-
-/* List of different livery classes, used only by the livery GUI. */
-typedef enum LiveryClasses {
-	LC_OTHER,
-	LC_RAIL,
-	LC_ROAD,
-	LC_SHIP,
-	LC_AIRCRAFT,
-	LC_END
-} LiveryClass;
-
-
-typedef struct Livery {
-	bool in_use;  ///< Set if this livery should be used instead of the default livery.
-	byte colour1; ///< First colour, for all vehicles.
-	byte colour2; ///< Second colour, for vehicles with 2CC support.
-} Livery;
-
-#endif /* LIVERY_H */