Required fixes for properly exporting the new symbols.

angavrilov · Nov 19, 2010 · 8439b3f · 8439b3f
1 parent c13b7c0
commit 8439b3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/library/DFTileTypes.cpp b/library/DFTileTypes.cpp
@@ -6,23 +6,23 @@
 namespace DFHack {
     //set tile class string lookup table (e.g. for printing to user)
 #define X(name,comment) #name,
-    DFHACK_EXPORT const char * TileClassString[tileclass_count+1] = {
+    const char * TileClassString[tileclass_count+1] = {
         TILECLASS_MACRO
             0
     };
 #undef X
 
     //string lookup table (e.g. for printing to user)
 #define X(name,comment) #name,
-    DFHACK_EXPORT const char * TileMaterialString[tilematerial_count+1] = {
+    const char * TileMaterialString[tilematerial_count+1] = {
         TILEMATERIAL_MACRO
             0
     };
 #undef X
 
     //string lookup table (e.g. for printing to user)
 #define X(name,comment) #name,
-    DFHACK_EXPORT const char * TileSpecialString[tilespecial_count+1] = {
+    const char * TileSpecialString[tilespecial_count+1] = {
         TILESPECIAL_MACRO
             0
     };

diff --git a/library/include/dfhack/DFTileTypes.h b/library/include/dfhack/DFTileTypes.h
@@ -26,6 +26,7 @@ distribution.
 #define TILETYPES_H_INCLUDED
 
 #include "DFPragma.h"
+#include "DFExport.h"
 
 namespace DFHack
 {
@@ -62,7 +63,7 @@ namespace DFHack
     };
     #undef X
 
-    extern const char *TileClassString[];
+    DFHACK_EXPORT extern const char *TileClassString[];
 
     #define TILEMATERIAL_MACRO \
         X(AIR,        "empty" ) \
@@ -96,7 +97,7 @@ namespace DFHack
     #undef X
 
 
-    extern const char *TileMaterialString[];
+    DFHACK_EXPORT extern const char *TileMaterialString[];
 
     // Special specials of the tile.
     // Not the best way to do this, but compatible with existing code.
@@ -126,7 +127,7 @@ namespace DFHack
     };
     #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
     enum TileVariant