From 39ae2d95fc78d547dd84002d77770a862b794ea1 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Tue, 11 Aug 2020 17:06:28 -0700 Subject: [PATCH] 2nd attempt to solve compilation errors on windows --- library/include/PluginStatics.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/library/include/PluginStatics.h b/library/include/PluginStatics.h index a88249eae..d0835e90f 100644 --- a/library/include/PluginStatics.h +++ b/library/include/PluginStatics.h @@ -5,30 +5,30 @@ namespace DFHack { // xlsxreader definitions -struct xlsx_file_handle_identity : public compound_identity { +struct DFHACK_EXPORT xlsx_file_handle_identity : public compound_identity { xlsx_file_handle_identity() :compound_identity(0, nullptr, nullptr, "xlsx_file_handle") {}; DFHack::identity_type type() override { return IDTYPE_OPAQUE; } }; -struct xlsx_sheet_handle_identity : public compound_identity { +struct DFHACK_EXPORT xlsx_sheet_handle_identity : public compound_identity { xlsx_sheet_handle_identity() :compound_identity(0, nullptr, nullptr, "xlsx_sheet_handle") {}; DFHack::identity_type type() override { return IDTYPE_OPAQUE; } }; -struct xlsx_file_handle { +struct DFHACK_EXPORT xlsx_file_handle { typedef struct xlsxio_read_struct* xlsxioreader; const xlsxioreader handle; xlsx_file_handle(xlsxioreader handle): handle(handle) {} - DFHACK_IMPORT static xlsx_file_handle_identity _identity; + static xlsx_file_handle_identity _identity; }; -struct xlsx_sheet_handle { +struct DFHACK_EXPORT xlsx_sheet_handle { typedef struct xlsxio_read_sheet_struct* xlsxioreadersheet; const xlsxioreadersheet handle; xlsx_sheet_handle(xlsxioreadersheet handle): handle(handle) {} - DFHACK_IMPORT static xlsx_sheet_handle_identity _identity; + static xlsx_sheet_handle_identity _identity; }; }