(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.
This commit is contained in:
35
src/yapf/track_dir.hpp
Normal file
35
src/yapf/track_dir.hpp
Normal file
@@ -0,0 +1,35 @@
|
||||
/* $Id$ */
|
||||
|
||||
#ifndef TRACK_DIR_HPP
|
||||
#define TRACK_DIR_HPP
|
||||
|
||||
EXTERN_C_BEGIN
|
||||
#include "../tile.h"
|
||||
#include "../openttd.h"
|
||||
#include "../map.h"
|
||||
#include "../rail.h"
|
||||
EXTERN_C_END
|
||||
|
||||
/** Helpers to allow to work with enum as with type safe bit set in C++ */
|
||||
#define DECLARE_ENUM_AS_BIT_MASK(mask_t) \
|
||||
FORCEINLINE mask_t operator | (mask_t m1, mask_t m2) {return (mask_t)((int)m1 | m2);} \
|
||||
FORCEINLINE mask_t operator & (mask_t m1, mask_t m2) {return (mask_t)((int)m1 & m2);} \
|
||||
FORCEINLINE mask_t operator ^ (mask_t m1, mask_t m2) {return (mask_t)((int)m1 ^ m2);} \
|
||||
FORCEINLINE mask_t& operator |= (mask_t& m1, mask_t m2) {m1 = m1 | m2; return m1;} \
|
||||
FORCEINLINE mask_t& operator &= (mask_t& m1, mask_t m2) {m1 = m1 & m2; return m1;} \
|
||||
FORCEINLINE mask_t& operator ^= (mask_t& m1, mask_t m2) {m1 = m1 ^ m2; return m1;} \
|
||||
FORCEINLINE mask_t operator ~(mask_t m) {return (mask_t)(~(int)m);}
|
||||
|
||||
/** probably redundant enum combining operators (as we have conversion functions) */
|
||||
#define DECLARE_ENUM_AS_BIT_INDEX(idx_t, mask_t) \
|
||||
FORCEINLINE mask_t operator << (int m, idx_t i) {return (mask_t)(m << (int)i);} \
|
||||
FORCEINLINE mask_t operator << (mask_t m, int i) {return (mask_t)(((int)m) << i);} \
|
||||
FORCEINLINE mask_t operator >> (mask_t m, int i) {return (mask_t)(((int)m) >> i);}
|
||||
|
||||
DECLARE_ENUM_AS_BIT_MASK(TrackBits)
|
||||
DECLARE_ENUM_AS_BIT_INDEX(Track, TrackBits)
|
||||
|
||||
DECLARE_ENUM_AS_BIT_MASK(TrackdirBits)
|
||||
DECLARE_ENUM_AS_BIT_INDEX(Trackdir, TrackdirBits)
|
||||
|
||||
#endif /* TRACK_DIR_HPP */
|
Reference in New Issue
Block a user