diff options
| author | Petr Mrázek | 2012-01-06 00:08:43 +0100 |
|---|---|---|
| committer | Petr Mrázek | 2012-01-06 00:08:43 +0100 |
| commit | 39a27d73e75b7ee22d93d31a9040322b0ceaa512 (patch) | |
| tree | 2163321b46a65d4c5da8ff1d5d03eb291f2919bf /common.h | |
| parent | 45b11988bccfeb059f55ded6e4ad0d317e802714 (diff) | |
| download | stonesense-39a27d73e75b7ee22d93d31a9040322b0ceaa512.tar.gz stonesense-39a27d73e75b7ee22d93d31a9040322b0ceaa512.tar.bz2 stonesense-39a27d73e75b7ee22d93d31a9040322b0ceaa512.tar.xz | |
Restructure common.h to prevent allegro from infulencing DFHack headers.
Diffstat (limited to 'common.h')
| -rw-r--r-- | common.h | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -8,6 +8,16 @@ #include <map>
#include <stdint.h>
+// allegro also leaks stdint.h and some weird equivalent of it on windows. let's disable the copy leaked by dfhack.
+#define SKIP_DFHACK_STDINT
+#define DFHACK_WANT_TILETYPES
+
+#include <DFHack.h>
+#include "Core.h"
+#include <Console.h>
+#include <Export.h>
+#include <PluginManager.h>
+
#define ALLEGRO_NO_MAGIC_MAIN //This is a DLL file. we got no main function.
#define ALLEGRO_HAVE_STDINT_H
@@ -21,15 +31,6 @@ // allegro leaks X headers, undef some of it here:
#undef TileShape
-// allegro also leaks stdint.h and some weird equivalent of it on windows. let's disable the copy leaked by dfhack.
-#define SKIP_DFHACK_STDINT
-#define DFHACK_WANT_TILETYPES
-
-#include <DFHack.h>
-#include "Core.h"
-#include <Console.h>
-#include <Export.h>
-#include <PluginManager.h>
#include "commonTypes.h"
#include "Block.h"
|
