sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore plugin prefix

This commit is contained in:
SirLynix 2023-01-29 21:59:24 +01:00
parent ee1a98b761
commit eb74c6ed07
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Core/PluginInterface.hpp
View File

@ -11,6 +11,12 @@
#include <Nazara/Core/Config.hpp> #include <Nazara/Core/Config.hpp>
#include <string> #include <string>
#ifdef NAZARA_COMPILER_MSVC
#define NazaraPluginPrefix ""
#else
#define NazaraPluginPrefix "lib"
#endif
namespace Nz namespace Nz
{ {
class NAZARA_CORE_API PluginInterface class NAZARA_CORE_API PluginInterface

4
include/Nazara/Utility/Plugins/AssimpPlugin.hpp
View File

@ -18,9 +18,9 @@ namespace Nz
{ {
public: public:
#ifdef NAZARA_DEBUG #ifdef NAZARA_DEBUG
static constexpr inline std::string_view Filename = "PluginAssimp-d"; static constexpr inline std::string_view Filename = NazaraPluginPrefix "PluginAssimp-d";
#else #else
static constexpr inline std::string_view Filename = "PluginAssimp"; static constexpr inline std::string_view Filename = NazaraPluginPrefix "PluginAssimp";
#endif #endif
AssimpPlugin() = default; AssimpPlugin() = default;

4
include/Nazara/Utility/Plugins/FFmpegPlugin.hpp
View File

@ -18,9 +18,9 @@ namespace Nz
{ {
public: public:
#ifdef NAZARA_DEBUG #ifdef NAZARA_DEBUG
static constexpr inline std::string_view Filename = "PluginFFmpeg-d"; static constexpr inline std::string_view Filename = NazaraPluginPrefix "PluginFFmpeg-d";
#else #else
static constexpr inline std::string_view Filename = "PluginFFmpeg"; static constexpr inline std::string_view Filename = NazaraPluginPrefix "PluginFFmpeg";
#endif #endif
FFmpegPlugin() = default; FFmpegPlugin() = default;

1
plugins/Assimp/xmake.lua
View File

@ -7,7 +7,6 @@ if has_config("assimp") then
set_kind("shared") set_kind("shared")
set_group("Plugins") set_group("Plugins")
add_rpathdirs("$ORIGIN") add_rpathdirs("$ORIGIN")
set_prefixname("")
add_deps("NazaraUtility") add_deps("NazaraUtility")
add_packages("assimp") add_packages("assimp")

1
plugins/FFmpeg/xmake.lua
View File

@ -7,7 +7,6 @@ if has_config("ffmpeg") then
set_kind("shared") set_kind("shared")
set_group("Plugins") set_group("Plugins")
add_rpathdirs("$ORIGIN") add_rpathdirs("$ORIGIN")
set_prefixname("")
add_deps("NazaraUtility") add_deps("NazaraUtility")
add_packages("ffmpeg") add_packages("ffmpeg")