fix Windows unity build

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-07-15 18:44:38 -07:00
parent 074518454c
commit 032a35e495
19 changed files with 2143 additions and 2141 deletions
@@ -10,8 +10,6 @@
#include <QApplication>
using namespace AZ;
// Handle asserts
class ToolsFrameworkHook
: public AZ::Test::ITestEnvironment
@@ -19,12 +17,12 @@ class ToolsFrameworkHook
public:
void SetupEnvironment() override
{
AllocatorInstance<SystemAllocator>::Create();
AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
}
void TeardownEnvironment() override
{
AllocatorInstance<SystemAllocator>::Destroy();
AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
}
};
@@ -5,13 +5,6 @@
*
*/
// All plugins suffer from the following warning:
// warning C4273: 'GetIEditor' : inconsistent dll linkage
// GetIEditor() is forward-declared using EDITOR_CORE_API, which without EDITOR_CORE set,
// results in dllimport rather than dllexport. This define ensure it's consistently and
// properly defined for export.
#define EDITOR_CORE
#include <platform.h>
#include <IEditor.h>
-4
View File
@@ -7,10 +7,6 @@
#pragma once
#if !defined(Q_MOC_RUN)
#include "Include/EditorCoreAPI.h"
#endif
#if !defined(Q_MOC_RUN)
#include "Include/EditorCoreAPI.h"
#include <QtViewPane.h>
@@ -5,6 +5,7 @@
*
*/
#include <AzCore/PlatformIncl.h>
#include <AzToolsFramework/UI/Docking/DockWidgetUtils.h>
AZ_PUSH_DISABLE_WARNING(4251 4244 4458, "-Wunknown-warning-option") // 4251: 'QTextStream::d_ptr': class 'QScopedPointer<QTextStreamPrivate,QScopedPointerDeleter<T>>' needs to have dll-interface to be used by clients of class 'QTextStream'