(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, 36 insertions, 0 deletions

diff --git a/src/bmp.h b/src/bmp.h
new file mode 100644
index 000000000..0587bab65
--- /dev/null
+++ b/src/bmp.h
@@ -0,0 +1,36 @@
+/* $Id$ */
+
+#ifndef BMP_H
+#define BMP_H
+
+typedef struct {
+	uint32 offset;       ///< offset of bitmap data from .bmp file begining
+	uint32 width;        ///< bitmap width
+	uint32 height;       ///< bitmap height
+	bool os2_bmp;        ///< true if OS/2 1.x or windows 2.x bitmap
+	uint16 bpp;          ///< bits per pixel
+	uint32 compression;  ///< compression method (0 = none, 1 = 8-bit RLE, 2 = 4-bit RLE)
+	uint32 palette_size; ///< number of colors in palette
+} BmpInfo;
+
+typedef struct {
+	Colour *palette;
+	byte   *bitmap;
+} BmpData;
+
+#define BMP_BUFFER_SIZE 1024
+
+typedef struct {
+	byte data[BMP_BUFFER_SIZE];
+	int pos;
+	int read;
+	FILE *file;
+	uint real_pos;
+} BmpBuffer;
+
+void BmpInitializeBuffer(BmpBuffer *buffer, FILE *file);
+bool BmpReadHeader(BmpBuffer *buffer, BmpInfo *info, BmpData *data);
+bool BmpReadBitmap(BmpBuffer *buffer, BmpInfo *info, BmpData *data);
+void BmpDestroyData(BmpData *data);
+
+#endif /* BMP_H */