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

diff --git a/newgrf_config.h b/newgrf_config.h
deleted file mode 100644
index 6ebc3ffa2..000000000
--- a/newgrf_config.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $Id$ */
-
-#ifndef NEWGRF_CONFIG_H
-#define NEWGRF_CONFIG_H
-
-/* GRF config bit flags */
-enum {
-	GCF_DISABLED,
-	GCF_NOT_FOUND,
-	GCF_ACTIVATED,
-	GCF_SYSTEM,
-	GCF_UNSAFE,
-	GCF_STATIC,
-	GCF_COPY,      ///< The data is copied from a grf in _all_grfs
-};
-
-typedef struct GRFConfig {
-	char *filename;
-	char *name;
-	char *info;
-	uint32 grfid;
-
-	uint8 flags;
-	uint8 md5sum[16];
-	uint32 param[0x80];
-	uint8 num_params;
-
-	struct GRFConfig *next;
-} GRFConfig;
-
-/* First item in list of all scanned NewGRFs */
-extern GRFConfig *_all_grfs;
-
-/* First item in list of current GRF set up */
-extern GRFConfig *_grfconfig;
-
-/* First item in list of default GRF set up */
-extern GRFConfig *_grfconfig_newgame;
-
-/* First item in list of static GRF set up */
-extern GRFConfig *_grfconfig_static;
-
-void ScanNewGRFFiles(void);
-const GRFConfig *FindGRFConfig(uint32 grfid, uint8 *md5sum);
-GRFConfig *GetGRFConfig(uint32 grfid);
-GRFConfig **CopyGRFConfigList(GRFConfig **dst, const GRFConfig *src);
-void AppendStaticGRFConfigs(GRFConfig **dst);
-void ClearGRFConfig(GRFConfig **config);
-void ClearGRFConfigList(GRFConfig **config);
-void ResetGRFConfig(bool defaults);
-bool IsGoodGRFConfigList(void);
-bool FillGRFDetails(GRFConfig *config, bool is_static);
-char *GRFBuildParamList(char *dst, const GRFConfig *c, const char *last);
-
-/* In newgrf_gui.c */
-void ShowNewGRFSettings(bool editable, bool show_params, bool exec_changes, GRFConfig **config);
-
-#ifdef ENABLE_NETWORK
-/* For communication about GRFs over the network */
-#define UNKNOWN_GRF_NAME_PLACEHOLDER "<Unknown>"
-char *FindUnknownGRFName(uint32 grfid, uint8 *md5sum, bool create);
-#endif /* ENABLE_NETWORK */
-
-#endif /* NEWGRF_CONFIG_H */