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

diff --git a/stdafx.h b/stdafx.h
deleted file mode 100644
index 8504e585c..000000000
--- a/stdafx.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/* $Id$ */
-
-#ifndef STDAFX_H
-#define STDAFX_H
-
-#include <stdio.h>
-#include <stddef.h>
-#include <string.h>
-#include <stdlib.h>
-
-// MacOS X will use an NSAlert to display failed assertaions since they're lost unless running from a terminal
-// strgen always runs from terminal and don't need a window for asserts
-#if !defined(__APPLE__) || defined(STRGEN)
-# include <assert.h>
-#else
-# include "os/macosx/macos.h"
-#endif
-
-#if defined(UNIX) || defined(__MINGW32__)
-# include <sys/types.h>
-#endif
-
-#if defined(__OS2__)
-# include <types.h>
-# define strcasecmp stricmp
-#endif
-
-#ifdef __BEOS__
-# include <SupportDefs.h>
-#endif
-
-#ifdef SUNOS
-# include <alloca.h>
-#endif
-
-#ifdef __MORPHOS__
-// morphos defines certain amiga defines per default, we undefine them
-// here to make the rest of source less messy and more clear what is
-// required for morphos and what for amigaos
-# ifdef amigaos
-#  undef amigaos
-# endif
-# ifdef __amigaos__
-#  undef __amigaos__
-# endif
-# ifdef __AMIGA__
-#  undef __AMIGA__
-# endif
-# ifdef AMIGA
-#  undef AMIGA
-# endif
-# ifdef amiga
-#  undef amiga
-# endif
-#endif /* __MORPHOS__ */
-
-#ifdef __APPLE__
-# include "os/macosx/osx_stdafx.h"
-// make endian swapping use Apple's macros to increase speed
-# define BSWAP32(x) Endian32_Swap(x)
-# define BSWAP16(x) Endian16_Swap(x)
-#else
-# define BSWAP32(x) ((((x) >> 24) & 0xFF) | (((x) >> 8) & 0xFF00) | (((x) << 8) & 0xFF0000) | (((x) << 24) & 0xFF000000))
-# define BSWAP16(x) ((x) >> 8 | (x) << 8)
-#endif /* __APPLE__ */
-
-// by default we use [] var arrays
-#define VARARRAY_SIZE
-
-
-// Stuff for GCC
-#if defined(__GNUC__)
-# define NORETURN __attribute__ ((noreturn))
-# define FORCEINLINE inline
-# define CDECL
-# define __int64 long long
-# define NOT_REACHED() assert(0)
-# define GCC_PACK __attribute__((packed))
-
-# if (__GNUC__ == 2)
-#  undef VARARRAY_SIZE
-#  define VARARRAY_SIZE 0
-# endif
-#endif /* __GNUC__ */
-
-#if defined(__WATCOMC__)
-# define NORETURN
-# define FORCEINLINE inline
-# define CDECL
-# define NOT_REACHED() assert(0)
-# define GCC_PACK
-# include <malloc.h>
-#endif /* __WATCOMC__ */
-
-#if defined(__MINGW32__) || defined(__CYGWIN__)
-# include <malloc.h> // alloca()
-#endif
-
-// Stuff for MSVC
-#if defined(_MSC_VER)
-# pragma once
-# define WIN32_LEAN_AND_MEAN     // Exclude rarely-used stuff from Windows headers
-# pragma warning(disable: 4244)  // 'conversion' conversion from 'type1' to 'type2', possible loss of data
-# pragma warning(disable: 4761)  // integral size mismatch in argument : conversion supplied
-
-# if _MSC_VER >= 1400              // MSVC 2005 safety checks
-#  pragma warning(disable: 4996)   // 'strdup' was declared deprecated
-#  define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions
-# endif /* _MSC_VER >= 1400 */
-
-# include <malloc.h> // alloca()
-# define NORETURN __declspec(noreturn)
-# define FORCEINLINE __forceinline
-# define inline _inline
-# define CDECL _cdecl
-# if defined(_DEBUG)
-#  define NOT_REACHED() assert(0)
-# else
-#  define NOT_REACHED() _assume(0)
-# endif /* _DEBUG */
-  int CDECL snprintf(char *str, size_t size, const char *format, ...);
-# if _MSC_VER < 1400
-   int CDECL vsnprintf(char *str, size_t size, const char *format, va_list ap);
-# endif
-
-# if defined(WIN32) && !defined(_WIN64) && !defined(WIN64)
-#  ifndef _W64
-#   define _W64
-#  endif
-   typedef _W64 int INT_PTR, *PINT_PTR;
-   typedef _W64 unsigned int UINT_PTR, *PUINT_PTR;
-# endif /* WIN32 && !_WIN64 && !WIN64 */
-
-# if _MSC_VER < 1300 // VC6 and lower
-#  ifdef  _WIN64
-    typedef __int64 intptr_t;
-#  else
-    typedef _W64 int intptr_t;
-#  endif
-# endif /* _MSC_VER < 1300 */
-
-# define GCC_PACK
-
-// This is needed to zlib uses the stdcall calling convention on visual studio, also used with libpng (VS6 warning)
-# if defined(WITH_ZLIB) || defined(WITH_PNG)
-#  ifndef ZLIB_WINAPI
-#   define ZLIB_WINAPI
-#  endif
-# endif
-
-# define strcasecmp stricmp
-# define strncasecmp strnicmp
-// suppress: warning C4005: 'offsetof' : macro redefinition (VC8)
-# include <stddef.h>
-#endif /* defined(_MSC_VER) */
-
-/* NOTE: the string returned by these functions is only valid until the next
- * call to the same function and is not thread- or reentrancy-safe */
-#if !defined(STRGEN)
-# if defined(WIN32) || defined(WIN64)
-#  define fopen(file, mode) _wfopen(OTTD2FS(file), L ## mode)
-   const char *FS2OTTD(const wchar_t *name);
-   const wchar_t *OTTD2FS(const char *name);
-# else
-#  define fopen(file, mode) fopen(OTTD2FS(file), mode)
-   const char *FS2OTTD(const char *name);
-   const char *OTTD2FS(const char *name);
-# endif /* WIN32 */
-#endif /* STRGEN */
-
-// Windows has always LITTLE_ENDIAN
-#if defined(WIN32) || defined(__OS2__) || defined(WIN64)
-# define TTD_LITTLE_ENDIAN
-#else
-// Else include endian[target/host].h, which has the endian-type, autodetected by the Makefile
-# if defined(STRGEN)
-#  include "endian_host.h"
-# else
-#  include "endian_target.h"
-# endif
-#endif /* WIN32 || __OS2__ || WIN64 */
-
-#if defined(WIN32) || defined(WIN64) || defined(__OS2__)
-# define PATHSEP "\\"
-# define PATHSEPCHAR '\\'
-#else
-# define PATHSEP "/"
-# define PATHSEPCHAR '/'
-#endif
-
-typedef unsigned char byte;
-#ifndef __BEOS__ // already defined
-  typedef unsigned char uint8;
-  typedef unsigned short uint16;
-  typedef unsigned int uint32;
-#endif
-
-// This is already defined in unix
-#if !defined(UNIX) && !defined(__CYGWIN__) && !defined(__BEOS__) && !defined(__MORPHOS__)
-  typedef unsigned int uint;
-#endif
-// Not defined in QNX Neutrino (6.x)
-#if defined(__QNXNTO__)
-  typedef unsigned int uint;
-#endif
-
-#ifndef __BEOS__
-
-// some platforms use 4 bytes bool in C++
-// C bool has to be the same
-#	ifndef __cplusplus
-#		ifdef FOUR_BYTE_BOOL
-			typedef unsigned long bool;
-#		else /* FOUR_BYTE_BOOL */
-			typedef unsigned char bool;
-#		endif /* FOUR_BYTE_BOOL */
-#	endif /* __cplusplus */
-
-	typedef signed char int8;
-	typedef signed short int16;
-	typedef signed int int32;
-	typedef signed __int64 int64;
-	typedef unsigned __int64 uint64;
-#endif /* __BEOS__ */
-
-#if defined(ARM) || defined(__arm__) || defined(__alpha__)
-# define OTTD_ALIGNMENT
-#endif
-
-// Setup alignment and conversion macros
-#if defined(TTD_BIG_ENDIAN)
-  static inline uint32 TO_LE32(uint32 x) { return BSWAP32(x); }
-  static inline uint16 TO_LE16(uint16 x) { return BSWAP16(x); }
-  static inline uint32 FROM_LE32(uint32 x) { return BSWAP32(x); }
-  static inline uint16 FROM_LE16(uint16 x) { return BSWAP16(x); }
-# define TO_BE32(x)   (x)
-# define TO_BE16(x)   (x)
-# define FROM_BE32(x) (x)
-# define FROM_BE16(x) (x)
-# define TO_LE32X(x)  BSWAP32(x)
-# define TO_BE32X(x)  (x)
-#else
-  static inline uint32 TO_BE32(uint32 x) { return BSWAP32(x); }
-  static inline uint16 TO_BE16(uint16 x) { return BSWAP16(x); }
-  static inline uint32 FROM_BE32(uint32 x) { return BSWAP32(x); }
-  static inline uint16 FROM_BE16(uint16 x) { return BSWAP16(x); }
-# define TO_LE32(x)   (x)
-# define TO_LE16(x)   (x)
-# define FROM_LE32(x) (x)
-# define FROM_LE16(x) (x)
-# define TO_LE32X(x)  (x)
-# define TO_BE32X(x)  BSWAP32(x)
-#endif /* TTD_BIG_ENDIAN */
-
-#if !defined(GAME_DATA_DIR)
-# define GAME_DATA_DIR ""
-#endif
-
-#if !defined(PERSONAL_DIR)
-# define PERSONAL_DIR ""
-#endif
-
-#ifndef __cplusplus
-# ifndef __BEOS__
-   enum {
-    false = 0,
-    true = 1,
-   };
-# endif
-#endif /* __cplusplus */
-
-// Compile time assertions
-#ifdef __OS2__
-# define assert_compile(expr)
-#else
-# ifdef __cplusplus
-#  define assert_compile(expr) extern "C" void __ct_assert__(int a[1 - 2 * !(expr)])
-# else /* __cplusplus */
-#  define assert_compile(expr) void __ct_assert__(int a[1 - 2 * !(expr)])
-# endif /* !__cplusplus */
-#endif /* __OS2__ */
-
-assert_compile(sizeof(uint32) == 4);
-assert_compile(sizeof(uint16) == 2);
-assert_compile(sizeof(uint8)  == 1);
-
-#define lengthof(x) (sizeof(x)/sizeof(x[0]))
-#define endof(x) (&x[lengthof(x)])
-#define lastof(x) (&x[lengthof(x) - 1])
-#ifndef offsetof
-# define offsetof(s,m)   (size_t)&(((s *)0)->m)
-#endif
-
-
-// take care of some name clashes on macos
-#if defined(__APPLE__)
-# define GetString OTTD_GetString
-# define DrawString OTTD_DrawString
-# define Random OTTD_Random
-# define CloseConnection OTTD_CloseConnection
-#endif /* __APPLE */
-
-#ifdef __AMIGA__
-// it seems AmigaOS already have a Point declared
-# define Point OTTD_AMIGA_POINT
-#endif
-
-#define EXTERN_C_BEGIN extern "C" {
-#define EXTERN_C_END   }
-
-#endif /* STDAFX_H */