Fixes for Linux no unity builds

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2022-01-21 16:42:30 -08:00
parent fd4014b278
commit 4d62351628
10 changed files with 61 additions and 3 deletions
+1 -1
View File
@@ -11,7 +11,7 @@
const char* GuidUtil::ToString(REFGUID guid)
{
static char guidString[64];
sprintf_s(guidString, "{%.8" GUID_FORMAT_DATA1 "-%.4X-%.4X-%.2X%.2X-%.2X%.2X%.2X%.2X%.2X%.2X}", guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1],
azsprintf(guidString, "{%.8" GUID_FORMAT_DATA1 "-%.4X-%.4X-%.2X%.2X-%.2X%.2X%.2X%.2X%.2X%.2X}", guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1],
guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]);
return guidString;
}
@@ -0,0 +1,47 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project.
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include "ToolsFileUtils.h"
#include <sys/stat.h>
#include <utime.h>
#include <QStorageInfo>
namespace AzToolsFramework
{
namespace ToolsFileUtils
{
bool SetModificationTime(const char* const filename, AZ::u64 modificationTime)
{
struct stat statResult;
if (stat(filename, &statResult) != 0)
{
return false;
}
struct utimbuf puttime;
puttime.modtime = modificationTime;
puttime.actime = static_cast<AZ::u64>(statResult.st_ctime);
if (utime(filename, &puttime) == 0)
{
return true;
}
return false;
}
bool GetFreeDiskSpace(const QString& path, qint64& outFreeDiskSpace)
{
QStorageInfo storageInfo(path);
outFreeDiskSpace = storageInfo.bytesFree();
return outFreeDiskSpace >= 0;
}
}
}
@@ -18,7 +18,7 @@ AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option")
#include <QPainter>
AZ_POP_DISABLE_WARNING
#include <QtWidgets/QToolButton>
#include <QtGUI/QRegExpValidator>
#include <QtGui/QRegExpValidator>
namespace AzToolsFramework
{
@@ -29,4 +29,5 @@ set(FILES
UI/UICore/SaveChangesDialog.hxx
UI/UICore/SaveChangesDialog.cpp
UI/UICore/SaveChangesDialog.ui
ToolsFileUtils/ToolsFileUtils_generic.cpp
)
@@ -29,4 +29,5 @@ set(FILES
UI/UICore/SaveChangesDialog.hxx
UI/UICore/SaveChangesDialog.cpp
UI/UICore/SaveChangesDialog.ui
ToolsFileUtils/ToolsFileUtils_generic.cpp
)
@@ -10,6 +10,7 @@
#include "RenderPlugin.h"
#include <EMotionFX/CommandSystem/Source/ImporterCommands.h>
#include <EMotionFX/CommandSystem/Source/SelectionCommands.h>
#include <EMotionStudio/EMStudioSDK/Source/EMStudioManager.h>
namespace EMStudio
@@ -13,6 +13,7 @@
#include <EMotionFX/Source/TransformData.h>
#include "RenderWidget.h"
#include "RenderViewWidget.h"
#include <EMotionStudio/EMStudioSDK/Source/EMStudioManager.h>
namespace EMStudio
@@ -15,8 +15,10 @@
#include <EMotionFX/CommandSystem/Source/SelectionCommands.h>
#include <EMotionFX/Source/AnimGraphManager.h>
#include <EMotionFX/Source/Recorder.h>
#include "../../../../EMStudioSDK/Source/RenderPlugin/RenderViewWidget.h"
#include <EMotionStudio/EMStudioSDK/Source/RenderPlugin/RenderViewWidget.h>
#include <EMotionStudio/EMStudioSDK/Source/EMStudioManager.h>
#include <QtGui/QPainter>
namespace EMStudio
{
@@ -8,6 +8,9 @@
#pragma once
// Graph Canvas
#include <GraphCanvas/Components/NodePropertyDisplay/NumericDataInterface.h>
// Graph Model
#include <GraphModel/Model/Slot.h>
@@ -36,3 +39,4 @@ namespace GraphModelIntegration
AZStd::weak_ptr<GraphModel::Slot> m_slot;
};
}
@@ -12,6 +12,7 @@
#include <ScriptCanvas/Grammar/ParsingUtilities.h>
#include <ScriptCanvas/Translation/GraphToLuaUtility.h>
#include <ScriptCanvas/Variable/VariableBus.h>
#include <AzCore/std/sort.h>
namespace ScriptCanvas
{