Merge branch 'UseSharedOutInterDirs' into UseSharedOutInterDirs
# Conflicts: # SHADE_Engine/src/Tools/SHLogger.h
This commit is contained in:
commit
9e5cbd4b6b
|
@ -23,7 +23,7 @@ namespace Sandbox
|
||||||
_In_ INT nCmdShow
|
_In_ INT nCmdShow
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
SHLOG_TITLE("Initialising SBApplication")
|
//SHLOG_TITLE("Initialising SBApplication")
|
||||||
|
|
||||||
window.Create(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
|
window.Create(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
|
||||||
|
|
||||||
|
|
|
@ -198,3 +198,4 @@ namespace SHADE
|
||||||
|
|
||||||
// For use outside the library to register the logger
|
// 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);
|
#define SHLOG_REGISTER(logger) spdlog::register_logger(logger); spdlog::set_level(spdlog::level::level_enum::trace);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue