Merge branch 'UseSharedOutInterDirs' into UseSharedOutInterDirs

# Conflicts:
#	SHADE_Engine/src/Tools/SHLogger.h
This commit is contained in:
Kah Wei 2022-09-14 19:54:04 +08:00
commit 9e5cbd4b6b
3 changed files with 3 additions and 2 deletions

View File

@ -23,7 +23,7 @@ namespace Sandbox
_In_ INT nCmdShow
)
{
SHLOG_TITLE("Initialising SBApplication")
//SHLOG_TITLE("Initialising SBApplication")
window.Create(hInstance, hPrevInstance, lpCmdLine, nCmdShow);

View File

@ -578,4 +578,4 @@ std::string GetDatePattern(SHADE::SHLogger::DateFormat fmt)
std::string GetClockPattern(bool is24HR)
{
return is24HR ? "%H:%M:%S" : "%I:%M:%S %p";
}
}

View File

@ -198,3 +198,4 @@ namespace SHADE
// For use outside the library to register the logger
#define SHLOG_REGISTER(logger) spdlog::register_logger(logger); spdlog::set_level(spdlog::level::level_enum::trace);