Merge remote-tracking branch 'origin/master' into 1.12
# Conflicts: # Content/Shaders/GI/DDGI.flax # Content/Shaders/GUI.flax # Flax.flaxproj # Source/Editor/Windows/AboutDialog.cs # Source/Engine/Serialization/Stream.cpp # Source/Shaders/GUICommon.hlsl
This commit is contained in:
@@ -581,7 +581,11 @@ void EngineImpl::InitLog()
|
||||
#if COMPILE_WITH_DEV_ENV
|
||||
LOG(Info, "Compiled for Dev Environment");
|
||||
#endif
|
||||
#if defined(FLAXENGINE_BRANCH) && defined(FLAXENGINE_COMMIT)
|
||||
LOG(Info, "Version " FLAXENGINE_VERSION_TEXT ", {}, {}", StringAsUTF16<>(FLAXENGINE_BRANCH).Get(), StringAsUTF16<>(FLAXENGINE_COMMIT).Get());
|
||||
#else
|
||||
LOG(Info, "Version " FLAXENGINE_VERSION_TEXT);
|
||||
#endif
|
||||
const Char* cpp = TEXT("?");
|
||||
if (__cplusplus == 202101L) cpp = TEXT("C++23");
|
||||
else if (__cplusplus == 202002L) cpp = TEXT("C++20");
|
||||
|
||||
Reference in New Issue
Block a user