diff --git a/premake5.lua b/premake5.lua index d0cdbac..b1dc7b0 100644 --- a/premake5.lua +++ b/premake5.lua @@ -3,6 +3,7 @@ project "bakatools" language "C++" cppdialect "C++17" systemversion "latest" + staticruntime "on" targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}") objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}") @@ -41,7 +42,6 @@ project "bakatools" runtime "Debug" symbols "on" - filter "configurations:Release" defines { diff --git a/src/bakatools/logging/log.cpp b/src/bakatools/logging/log.cpp index 4d6da7e..0374480 100644 --- a/src/bakatools/logging/log.cpp +++ b/src/bakatools/logging/log.cpp @@ -5,7 +5,7 @@ namespace Bk { std::shared_ptr Log::p_core_logger; std::shared_ptr Log::p_app_logger; - void Log::init() + void Log::init(std::string core) { std::vector log_sinks; log_sinks.emplace_back(std::make_shared()); @@ -14,7 +14,7 @@ namespace Bk { log_sinks[0]->set_pattern("%^[%T] %n: %v%$"); log_sinks[1]->set_pattern("[%T] [%l] %n: %v"); - p_core_logger = std::make_shared("BAKARA", begin(log_sinks), end(log_sinks)); + p_core_logger = std::make_shared(core, begin(log_sinks), end(log_sinks)); spdlog::register_logger(p_core_logger); p_core_logger->set_level(spdlog::level::trace); p_core_logger->flush_on(spdlog::level::trace); diff --git a/src/bakatools/logging/log.h b/src/bakatools/logging/log.h index a34b79b..fead92d 100644 --- a/src/bakatools/logging/log.h +++ b/src/bakatools/logging/log.h @@ -10,7 +10,7 @@ namespace Bk { class Log { public: - static void init(); + static void init(std::string core); static std::shared_ptr& get_core_logger() { return p_core_logger; } static std::shared_ptr& get_app_logger() { return p_app_logger; } @@ -19,17 +19,17 @@ namespace Bk { static std::shared_ptr p_app_logger; }; #ifdef BK_DEBUG - #define BK_CORE_TRACE(...) ::Bk::Log::get_core_logger()->trace(__VA_ARGS__) - #define BK_CORE_INFO(...) ::Bk::Log::get_core_logger()->info(__VA_ARGS__) - #define BK_CORE_WARN(...) ::Bk::Log::get_core_logger()->warn(__VA_ARGS__) - #define BK_CORE_ERROR(...) ::Bk::Log::get_core_logger()->error(__VA_ARGS__) - #define BK_CORE_CRITICAL(...) ::Bk::Log::get_core_logger()->critical(__VA_ARGS__) + #define BK_CORE_TRACE(...) Bk::Log::get_core_logger()->trace(__VA_ARGS__) + #define BK_CORE_INFO(...) Bk::Log::get_core_logger()->info(__VA_ARGS__) + #define BK_CORE_WARN(...) Bk::Log::get_core_logger()->warn(__VA_ARGS__) + #define BK_CORE_ERROR(...) Bk::Log::get_core_logger()->error(__VA_ARGS__) + #define BK_CORE_CRITICAL(...) Bk::Log::get_core_logger()->critical(__VA_ARGS__) - #define BK_TRACE(...) ::Bk::Log::get_app_logger()->trace(__VA_ARGS__) - #define BK_INFO(...) ::Bk::Log::get_app_logger()->info(__VA_ARGS__) - #define BK_WARN(...) ::Bk::Log::get_app_logger()->warn(__VA_ARGS__) - #define BK_ERROR(...) ::Bk::Log::get_app_logger()->error(__VA_ARGS__) - #define BK_CRITICAL(...) ::Bk::Log::get_app_logger()->critical(__VA_ARGS__) + #define BK_TRACE(...) Bk::Log::get_app_logger()->trace(__VA_ARGS__) + #define BK_INFO(...) Bk::Log::get_app_logger()->info(__VA_ARGS__) + #define BK_WARN(...) Bk::Log::get_app_logger()->warn(__VA_ARGS__) + #define BK_ERROR(...) Bk::Log::get_app_logger()->error(__VA_ARGS__) + #define BK_CRITICAL(...) Bk::Log::get_app_logger()->critical(__VA_ARGS__) #else #define BK_CORE_TRACE(...) #define BK_CORE_INFO(...)