XCode doesnt support files per configuration, using the old method (#3789)
- some warn fixes - fixed release linking issue Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
@@ -84,12 +84,6 @@ AZ_POP_DISABLE_WARNING
|
||||
#include "IEditorPanelUtils.h"
|
||||
#include "EditorPanelUtils.h"
|
||||
|
||||
|
||||
// even in Release mode, the editor will return its heap, because there's no Profile build configuration for the editor
|
||||
#ifdef _RELEASE
|
||||
#undef _RELEASE
|
||||
#endif
|
||||
|
||||
#include "Core/QtEditorApplication.h" // for Editor::EditorQtApplication
|
||||
|
||||
static CCryEditDoc * theDocument;
|
||||
@@ -104,8 +98,6 @@ static CCryEditDoc * theDocument;
|
||||
#define VERIFY(EXPRESSION) { auto e = EXPRESSION; assert(e); }
|
||||
#endif
|
||||
|
||||
#undef GetCommandLine
|
||||
|
||||
const char* CEditorImpl::m_crashLogFileName = "SessionStatus/editor_statuses.json";
|
||||
|
||||
CEditorImpl::CEditorImpl()
|
||||
|
||||
@@ -72,11 +72,8 @@ namespace AzFramework
|
||||
/// Retrieves the app root path for the application.
|
||||
virtual const char* GetAppRoot() const { return nullptr; }
|
||||
|
||||
#pragma push_macro("GetCommandLine")
|
||||
#undef GetCommandLine
|
||||
/// Get the Command Line arguments passed in.
|
||||
virtual const CommandLine* GetCommandLine() { return nullptr; }
|
||||
#pragma pop_macro("GetCommandLine")
|
||||
|
||||
/// Get the Command Line arguments passed in. (Avoids collisions with platform specific macros.)
|
||||
virtual const CommandLine* GetApplicationCommandLine() { return nullptr; }
|
||||
|
||||
@@ -13,10 +13,6 @@
|
||||
#define CRYINCLUDE_CRYCOMMON_APPLESPECIFIC_H
|
||||
#pragma once
|
||||
|
||||
#if defined(__clang__)
|
||||
#pragma diagnostic ignore "-W#pragma-messages"
|
||||
#endif
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// Standard includes.
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -118,10 +118,6 @@ struct IConsoleVarSink
|
||||
// </interfuscator:shuffle>
|
||||
};
|
||||
|
||||
#if defined(GetCommandLine)
|
||||
#undef GetCommandLine
|
||||
#endif
|
||||
|
||||
// Interface to the arguments of the console command.
|
||||
struct IConsoleCmdArgs
|
||||
{
|
||||
|
||||
@@ -715,12 +715,7 @@ void AssetProcessingStateDataUnitTest::DataTest(AssetProcessor::AssetDatabaseCon
|
||||
|
||||
//try retrieving this source by id
|
||||
UNIT_TEST_EXPECT_TRUE(stateData->GetJobByJobID(job.m_jobID, job));
|
||||
if (job.m_jobID == AzToolsFramework::AssetDatabase::InvalidEntryId ||
|
||||
job.m_jobID != job.m_jobID ||
|
||||
job.m_sourcePK != job.m_sourcePK ||
|
||||
job.m_jobKey != job.m_jobKey ||
|
||||
job.m_fingerprint != job.m_fingerprint ||
|
||||
job.m_platform != job.m_platform)
|
||||
if (job.m_jobID == AzToolsFramework::AssetDatabase::InvalidEntryId)
|
||||
{
|
||||
Q_EMIT UnitTestFailed("AssetProcessingStateDataTest Failed - GetJobByJobID failed");
|
||||
return;
|
||||
|
||||
@@ -57,9 +57,6 @@
|
||||
|
||||
#include <sstream>
|
||||
|
||||
// windows headers bring in a macro which conflicts GetCommandLine
|
||||
#undef GetCommandLine
|
||||
|
||||
namespace AssetUtilsInternal
|
||||
{
|
||||
static const unsigned int g_RetryWaitInterval = 250; // The amount of time that we are waiting for retry.
|
||||
|
||||
Reference in New Issue
Block a user