From cb6b96dea6ef5bdd65f04e8a5f54cb785544a11d Mon Sep 17 00:00:00 2001 From: Vizepi Date: Tue, 9 Feb 2021 18:08:50 +0100 Subject: [PATCH 1/2] [C++] Added FLAXENGINE_API macro on SettingsBase class so static symbol are retrieved by linker --- Source/Engine/Core/Config/Settings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Engine/Core/Config/Settings.h b/Source/Engine/Core/Config/Settings.h index 0380c96b3..e21e558fc 100644 --- a/Source/Engine/Core/Config/Settings.h +++ b/Source/Engine/Core/Config/Settings.h @@ -9,7 +9,7 @@ /// /// Base class for all global settings containers for the engine. Helps to apply, store and expose properties to c#. /// -class SettingsBase +class FLAXENGINE_API SettingsBase { public: From 6673d70d0acbcd0519005a766ae842fd14b3576c Mon Sep 17 00:00:00 2001 From: Vizepi Date: Tue, 9 Feb 2021 18:20:20 +0100 Subject: [PATCH 2/2] [C++] Add missing header forcing client code to include two headers instead of one --- Source/Engine/Core/Config/LayersTagsSettings.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Engine/Core/Config/LayersTagsSettings.h b/Source/Engine/Core/Config/LayersTagsSettings.h index 4ed9394fb..c01f915aa 100644 --- a/Source/Engine/Core/Config/LayersTagsSettings.h +++ b/Source/Engine/Core/Config/LayersTagsSettings.h @@ -3,6 +3,7 @@ #pragma once #include "Engine/Core/Config/Settings.h" +#include "Engine/Serialization/Json.h" /// /// Layers and objects tags settings.