From bb7d4f7812aca4c94f4fa94f7daac0cfe8e39340 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Sun, 7 Aug 2022 21:06:17 +0200 Subject: [PATCH] Fix console builds --- Source/Engine/Scripting/Scripting.cpp | 7 +++---- Source/Engine/Threading/JobSystem.cpp | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Engine/Scripting/Scripting.cpp b/Source/Engine/Scripting/Scripting.cpp index d90a18c58..cc128c548 100644 --- a/Source/Engine/Scripting/Scripting.cpp +++ b/Source/Engine/Scripting/Scripting.cpp @@ -739,10 +739,9 @@ ScriptingObject* Scripting::NewObject(const MClass* type) LOG(Error, "Invalid type."); return nullptr; } - MonoClass* typeClass = type->GetNative(); - #if USE_MONO // Get the assembly with that class + MonoClass* typeClass = type->GetNative(); auto module = ManagedBinaryModule::FindModule(typeClass); if (module == nullptr) { @@ -767,11 +766,11 @@ ScriptingObject* Scripting::NewObject(const MClass* type) LOG(Error, "Failed to spawn object of type \'{0}.{1}\'.", String(mono_class_get_namespace(typeClass)), String(mono_class_get_name(typeClass))); return nullptr; } + return obj; #else LOG(Error, "Not supported object creation from Managed class."); + return nullptr; #endif - - return obj; } FLAXENGINE_API ScriptingObject* FindObject(const Guid& id, MClass* type) diff --git a/Source/Engine/Threading/JobSystem.cpp b/Source/Engine/Threading/JobSystem.cpp index 234e05dab..c297f65ce 100644 --- a/Source/Engine/Threading/JobSystem.cpp +++ b/Source/Engine/Threading/JobSystem.cpp @@ -5,6 +5,7 @@ #include "Engine/Platform/CPUInfo.h" #include "Engine/Platform/Thread.h" #include "Engine/Platform/ConditionVariable.h" +#include "Engine/Core/Collections/Dictionary.h" #include "Engine/Engine/EngineService.h" #include "Engine/Profiler/ProfilerCPU.h" #include "Engine/Scripting/ManagedCLR/MCore.h"