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

diff --git a/src/win32.h b/src/win32.h
new file mode 100644
index 000000000..bd4720789
--- /dev/null
+++ b/src/win32.h
@@ -0,0 +1,45 @@
+/* $Id$ */
+
+#ifndef WIN32_H
+#define WIN32_H
+
+#include <windows.h>
+bool MyShowCursor(bool show);
+
+typedef void (*Function)(int);
+bool LoadLibraryList(Function proc[], const char *dll);
+
+char *convert_from_fs(const wchar_t *name, char *utf8_buf, size_t buflen);
+wchar_t *convert_to_fs(const char *name, wchar_t *utf16_buf, size_t buflen);
+
+/* Function shortcuts for UTF-8 <> UNICODE conversion. When unicode is not
+ * defined these macros return the string passed to them, with UNICODE
+ * they return a pointer to the converted string. The only difference between
+ * XX_TO_YY and XX_TO_YY_BUFFER is that with the buffer variant you can
+ * specify where to put the converted string (and how long it can be). Without
+ * the buffer and internal buffer is used, of max 512 characters */
+#if defined(UNICODE)
+# define MB_TO_WIDE(str) OTTD2FS(str)
+# define MB_TO_WIDE_BUFFER(str, buffer, buflen) convert_to_fs(str, buffer, buflen)
+# define WIDE_TO_MB(str) FS2OTTD(str)
+# define WIDE_TO_MB_BUFFER(str, buffer, buflen) convert_from_fs(str, buffer, buflen)
+#else
+# define MB_TO_WIDE(str) (str)
+# define MB_TO_WIDE_BUFFER(str, buffer, buflen) (str)
+# define WIDE_TO_MB(str) (str)
+# define WIDE_TO_MB_BUFFER(str, buffer, buflen) (str)
+#endif
+
+/* Override SHGetFolderPath with our custom implementation */
+#if defined(SHGetFolderPath)
+#undef SHGetFolderPath
+#endif
+#define SHGetFolderPath OTTDSHGetFolderPath
+
+HRESULT OTTDSHGetFolderPath(HWND, int, HANDLE, DWORD, LPTSTR);
+
+#if defined(__MINGW32__)
+#define SHGFP_TYPE_CURRENT 0
+#endif /* __MINGW32__ */
+
+#endif /* WIN32_H */