From eb74c6ed073b235d66261609d9476a14ca3e902b Mon Sep 17 00:00:00 2001 From: SirLynix Date: Sun, 29 Jan 2023 21:59:24 +0100 Subject: [PATCH] Restore plugin prefix --- include/Nazara/Core/PluginInterface.hpp | 6 ++++++ include/Nazara/Utility/Plugins/AssimpPlugin.hpp | 4 ++-- include/Nazara/Utility/Plugins/FFmpegPlugin.hpp | 4 ++-- plugins/Assimp/xmake.lua | 1 - plugins/FFmpeg/xmake.lua | 1 - 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/Nazara/Core/PluginInterface.hpp b/include/Nazara/Core/PluginInterface.hpp index a79790ff2..0d4d06ffb 100644 --- a/include/Nazara/Core/PluginInterface.hpp +++ b/include/Nazara/Core/PluginInterface.hpp @@ -11,6 +11,12 @@ #include #include +#ifdef NAZARA_COMPILER_MSVC +#define NazaraPluginPrefix "" +#else +#define NazaraPluginPrefix "lib" +#endif + namespace Nz { class NAZARA_CORE_API PluginInterface diff --git a/include/Nazara/Utility/Plugins/AssimpPlugin.hpp b/include/Nazara/Utility/Plugins/AssimpPlugin.hpp index e5b4a54cf..f35415bbe 100644 --- a/include/Nazara/Utility/Plugins/AssimpPlugin.hpp +++ b/include/Nazara/Utility/Plugins/AssimpPlugin.hpp @@ -18,9 +18,9 @@ namespace Nz { public: #ifdef NAZARA_DEBUG - static constexpr inline std::string_view Filename = "PluginAssimp-d"; + static constexpr inline std::string_view Filename = NazaraPluginPrefix "PluginAssimp-d"; #else - static constexpr inline std::string_view Filename = "PluginAssimp"; + static constexpr inline std::string_view Filename = NazaraPluginPrefix "PluginAssimp"; #endif AssimpPlugin() = default; diff --git a/include/Nazara/Utility/Plugins/FFmpegPlugin.hpp b/include/Nazara/Utility/Plugins/FFmpegPlugin.hpp index f1653e76e..8ca5fcb11 100644 --- a/include/Nazara/Utility/Plugins/FFmpegPlugin.hpp +++ b/include/Nazara/Utility/Plugins/FFmpegPlugin.hpp @@ -18,9 +18,9 @@ namespace Nz { public: #ifdef NAZARA_DEBUG - static constexpr inline std::string_view Filename = "PluginFFmpeg-d"; + static constexpr inline std::string_view Filename = NazaraPluginPrefix "PluginFFmpeg-d"; #else - static constexpr inline std::string_view Filename = "PluginFFmpeg"; + static constexpr inline std::string_view Filename = NazaraPluginPrefix "PluginFFmpeg"; #endif FFmpegPlugin() = default; diff --git a/plugins/Assimp/xmake.lua b/plugins/Assimp/xmake.lua index 300ef1236..f8829271b 100644 --- a/plugins/Assimp/xmake.lua +++ b/plugins/Assimp/xmake.lua @@ -7,7 +7,6 @@ if has_config("assimp") then set_kind("shared") set_group("Plugins") add_rpathdirs("$ORIGIN") - set_prefixname("") add_deps("NazaraUtility") add_packages("assimp") diff --git a/plugins/FFmpeg/xmake.lua b/plugins/FFmpeg/xmake.lua index 1ce5d8fd3..5c113f1b2 100644 --- a/plugins/FFmpeg/xmake.lua +++ b/plugins/FFmpeg/xmake.lua @@ -7,7 +7,6 @@ if has_config("ffmpeg") then set_kind("shared") set_group("Plugins") add_rpathdirs("$ORIGIN") - set_prefixname("") add_deps("NazaraUtility") add_packages("ffmpeg")