From 46a62256fe99c3cd2c98e364ce7b0cba665e6746 Mon Sep 17 00:00:00 2001 From: shad0wshayd3 Date: Fri, 6 Sep 2024 22:44:20 -0600 Subject: [PATCH] add F4SE defines inline with other clib projects --- CommonLibF4/include/F4SE/Interfaces.h | 8 ++++++-- CommonLibF4/xmake.lua | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CommonLibF4/include/F4SE/Interfaces.h b/CommonLibF4/include/F4SE/Interfaces.h index a940316e..61be8682 100644 --- a/CommonLibF4/include/F4SE/Interfaces.h +++ b/CommonLibF4/include/F4SE/Interfaces.h @@ -521,5 +521,9 @@ namespace F4SE } #define F4SE_EXPORT extern "C" [[maybe_unused]] __declspec(dllexport) -#define F4SE_PLUGIN_PRELOAD(...) F4SE_EXPORT bool F4SEPlugin_Preload(__VA_ARGS__) -#define F4SE_PLUGIN_LOAD(...) F4SE_EXPORT bool F4SEPlugin_Load(__VA_ARGS__) +#define F4SEPluginPreload(...) F4SE_EXPORT bool F4SEPlugin_Preload(__VA_ARGS__) +#define F4SEPluginLoad(...) F4SE_EXPORT bool F4SEPlugin_Load(__VA_ARGS__) +#define F4SEPluginVersion F4SE_EXPORT constinit F4SE::PluginVersionData F4SEPlugin_Version +#define F4SE_PLUGIN_PRELOAD F4SEPluginPreload +#define F4SE_PLUGIN_LOAD F4SEPluginLoad +#define F4SE_PLUGIN_VERSION F4SEPluginVersion diff --git a/CommonLibF4/xmake.lua b/CommonLibF4/xmake.lua index d4648663..1d7dc92d 100644 --- a/CommonLibF4/xmake.lua +++ b/CommonLibF4/xmake.lua @@ -16,7 +16,7 @@ target("commonlibf4", function() add_packages("rsm-binary-io", "rsm-mmio", "spdlog", { public = true }) if has_config("f4se_xbyak") then - add_packages("xbyak") + add_packages("xbyak", { public = true }) end -- add options