split plugin lua macros to separate header

this will reduce the number of translation units that require the includes from the lua dependency

Author: ab9rf

library/CMakeLists.txt

@@ -71,6 +71,7 @@ set(MAIN_HEADERS
     include/Module.h
     include/MemAccess.h
     include/ModuleFactory.h
+    include/PluginLua.h
     include/PluginManager.h
     include/PluginStatics.h
     include/RemoteClient.h

library/VTableInterpose.cpp

@@ -29,8 +29,9 @@ distribution.
 #include <vector>
 #include <map>
 
-#include "MemAccess.h"
 #include "Core.h"
+#include "DataFuncs.h"
+#include "MemAccess.h"
 #include "VersionInfo.h"
 #include "VTableInterpose.h"
 

library/include/PluginLua.h

@@ -0,0 +1,19 @@
+/*
+ * Additional macros for calling Lua from a plugin
+ */
+
+#pragma once
+
+#include "DataFuncs.h"
+
+#define DFHACK_PLUGIN_LUA_COMMANDS \
+    DFhackCExport const DFHack::CommandReg plugin_lua_commands[] =
+#define DFHACK_PLUGIN_LUA_FUNCTIONS \
+    DFhackCExport const DFHack::FunctionReg plugin_lua_functions[] =
+#define DFHACK_PLUGIN_LUA_EVENTS \
+    DFhackCExport const DFHack::EventReg plugin_lua_events[] =
+
+#define DFHACK_LUA_COMMAND(name) { #name, name }
+#define DFHACK_LUA_FUNCTION(name) { #name, df::wrap_function(name,true) }
+#define DFHACK_LUA_EVENT(name) { #name, &name##_event }
+#define DFHACK_LUA_END { NULL, NULL }

library/include/PluginManager.h

@@ -34,7 +34,6 @@ distribution.
 #include <vector>
 
 #include "Core.h"
-#include "DataFuncs.h"
 
 typedef struct lua_State lua_State;
 
@@ -324,19 +323,6 @@ extern "C" { \
     DFhackDataExport bool plugin_is_enabled = false; \
     bool &varname = plugin_is_enabled;
 
-#define DFHACK_PLUGIN_LUA_COMMANDS \
-    DFhackCExport const DFHack::CommandReg plugin_lua_commands[] =
-#define DFHACK_PLUGIN_LUA_FUNCTIONS \
-    DFhackCExport const DFHack::FunctionReg plugin_lua_functions[] =
-#define DFHACK_PLUGIN_LUA_EVENTS \
-    DFhackCExport const DFHack::EventReg plugin_lua_events[] =
-
-#define DFHACK_LUA_COMMAND(name) { #name, name }
-#define DFHACK_LUA_FUNCTION(name) { #name, df::wrap_function(name,true) }
-#define DFHACK_LUA_EVENT(name) { #name, &name##_event }
-#define DFHACK_LUA_END { NULL, NULL }
-
-
 #define REQUIRE_GLOBAL_NO_USE(global_name) \
     static int VARIABLE_IS_NOT_USED CONCAT_TOKENS(required_globals_, __LINE__) = \
         (plugin_globals->push_back(#global_name), 0);

plugins/aquifer.cpp

@@ -1,6 +1,7 @@
 #include "Debug.h"
 #include "LuaTools.h"
 #include "PluginManager.h"
+#include "PluginLua.h"
 #include "TileTypes.h"
 
 #include "modules/Maps.h"

plugins/autobutcher.cpp

@@ -7,6 +7,7 @@
 #include "Debug.h"
 #include "LuaTools.h"
 #include "PluginManager.h"
+#include "PluginLua.h"
 
 #include "modules/Persistence.h"
 #include "modules/Units.h"

plugins/autochop.cpp

@@ -3,6 +3,7 @@
 #include "Debug.h"
 #include "LuaTools.h"
 #include "PluginManager.h"
+#include "PluginLua.h"
 #include "TileTypes.h"
 
 #include "modules/Burrows.h"

plugins/autoclothing.cpp

@@ -2,6 +2,7 @@
 
 #include "Debug.h"
 #include "PluginManager.h"
+#include "PluginLua.h"
 
 #include "modules/Items.h"
 #include "modules/Materials.h"

plugins/autonestbox.cpp

@@ -7,6 +7,7 @@
 #include "Debug.h"
 #include "LuaTools.h"
 #include "PluginManager.h"
+#include "PluginLua.h"
 
 #include "modules/Buildings.h"
 #include "modules/Gui.h"

plugins/blueprint.cpp

@@ -15,6 +15,7 @@
 #include "Debug.h"
 #include "LuaTools.h"
 #include "PluginManager.h"
+#include "PluginLua.h"
 #include "TileTypes.h"
 
 #include "modules/Buildings.h"