MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Required fixes for properly exporting the new symbols.

develop
Petr Mrázek 2010-11-19 02:40:38 +01:00
parent c13b7c035f
commit 8439b3fa7d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/DFTileTypes.cpp
Unescape Escape View File

@ -6,7 +6,7 @@
namespace DFHack { namespace DFHack {
//set tile class string lookup table (e.g. for printing to user) //set tile class string lookup table (e.g. for printing to user)
#define X(name,comment) #name, #define X(name,comment) #name,
DFHACK_EXPORT const char * TileClassString[tileclass_count+1] = { const char * TileClassString[tileclass_count+1] = {
TILECLASS_MACRO TILECLASS_MACRO
0 0
}; };
@ -14,7 +14,7 @@ namespace DFHack {
//string lookup table (e.g. for printing to user) //string lookup table (e.g. for printing to user)
#define X(name,comment) #name, #define X(name,comment) #name,
DFHACK_EXPORT const char * TileMaterialString[tilematerial_count+1] = { const char * TileMaterialString[tilematerial_count+1] = {
TILEMATERIAL_MACRO TILEMATERIAL_MACRO
0 0
}; };
@ -22,7 +22,7 @@ namespace DFHack {
//string lookup table (e.g. for printing to user) //string lookup table (e.g. for printing to user)
#define X(name,comment) #name, #define X(name,comment) #name,
DFHACK_EXPORT const char * TileSpecialString[tilespecial_count+1] = { const char * TileSpecialString[tilespecial_count+1] = {
TILESPECIAL_MACRO TILESPECIAL_MACRO
0 0
}; };

7
library/include/dfhack/DFTileTypes.h
Unescape Escape View File

@ -26,6 +26,7 @@ distribution.
#define TILETYPES_H_INCLUDED #define TILETYPES_H_INCLUDED
#include "DFPragma.h" #include "DFPragma.h"
#include "DFExport.h"
namespace DFHack namespace DFHack
{ {
@ -62,7 +63,7 @@ namespace DFHack
}; };
#undef X #undef X
extern const char *TileClassString[]; DFHACK_EXPORT extern const char *TileClassString[];
#define TILEMATERIAL_MACRO \ #define TILEMATERIAL_MACRO \
X(AIR, "empty" ) \ X(AIR, "empty" ) \
@ -96,7 +97,7 @@ namespace DFHack
#undef X #undef X
extern const char *TileMaterialString[]; DFHACK_EXPORT extern const char *TileMaterialString[];
// Special specials of the tile. // Special specials of the tile.
// Not the best way to do this, but compatible with existing code. // Not the best way to do this, but compatible with existing code.
@ -126,7 +127,7 @@ namespace DFHack
}; };
#undef X #undef X
extern const char *TileSpecialString[]; DFHACK_EXPORT extern const char *TileSpecialString[];
// variants are used for tiles, where there are multiple variants of the same - like grass floors // variants are used for tiles, where there are multiple variants of the same - like grass floors
enum TileVariant enum TileVariant