diff options
| author | rubidium <rubidium@openttd.org> | 2007-01-02 19:19:48 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-01-02 19:19:48 +0000 |
| commit | 66bbf336c6af7353ef0aeed58002c46543b30635 (patch) | |
| tree | ad4a63860df2626b22f77e7dac712e958bea54cb /yapf/track_dir.hpp | |
| parent | ccc0a3f4dbf58c005b22341ac8874252924690cd (diff) | |
| download | openttd-66bbf336c6af7353ef0aeed58002c46543b30635.tar.xz | |
(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.
Diffstat (limited to 'yapf/track_dir.hpp')
| -rw-r--r-- | yapf/track_dir.hpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/yapf/track_dir.hpp b/yapf/track_dir.hpp deleted file mode 100644 index 0239f853e..000000000 --- a/yapf/track_dir.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/* $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 */ |