birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Builds Windows nounity and unity

Browse Source 
Builds Linux nounity and unity

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-07-16 13:13:59 -07:00
parent 032a35e495
commit 7c9653087d
45 changed files with 77 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp
+5 -5
View File
@@ -1025,7 +1025,7 @@ namespace AssetUtilities
AZStd::string ComputeJobLogFileName(const AzToolsFramework::AssetSystem::JobInfo& jobInfo)
{
return AZStd::string::format("%s-%u-%" PRIu64 ".log", jobInfo.m_sourceFile.c_str(), jobInfo.GetHash(), static_cast<uint64_t>(jobInfo.m_jobRunKey));
return AZStd::string::format("%s-%u-%" PRIu64 ".log", jobInfo.m_sourceFile.c_str(), jobInfo.GetHash(), jobInfo.m_jobRunKey);
}
AZStd::string ComputeJobLogFileName(const AssetBuilderSDK::CreateJobsRequest& createJobsRequest)
@@ -1245,7 +1245,7 @@ namespace AssetUtilities
return 0;
}
std::uint64_t AdjustTimestamp(QDateTime timestamp)
AZ::u64 AdjustTimestamp(QDateTime timestamp)
{
timestamp = timestamp.toUTC();
@@ -1280,7 +1280,7 @@ namespace AssetUtilities
else
{
bool useHash = ShouldUseFileHashing();
std::uint64_t fileIdentifier;
AZ::u64 fileIdentifier;
if(useHash)
{
fileIdentifier = GetFileHash(absolutePath.c_str());
@@ -1294,13 +1294,13 @@ namespace AssetUtilities
// so we add the size of it too.
// its also possible that it moved to a different file with the same modtime/hash AND size,
// but with a different name. So we add that too.
return AZStd::string::format("%" PRIX64 ":%" PRIu64 ":%s", fileIdentifier, aznumeric_cast<uint64_t>(fileStateInfo.m_fileSize), nameToUse.c_str());
return AZStd::string::format("%" PRIX64 ":%" PRIu64 ":%s", fileIdentifier, fileStateInfo.m_fileSize, nameToUse.c_str());
}
}
AZStd::string ComputeJobLogFileName(const AssetProcessor::JobEntry& jobEntry)
{
return AZStd::string::format("%s-%u-%" PRIu64 ".log", jobEntry.m_databaseSourceName.toUtf8().constData(), jobEntry.GetHash(), static_cast<uint64_t>(jobEntry.m_jobRunKey));
return AZStd::string::format("%s-%u-%" PRIu64 ".log", jobEntry.m_databaseSourceName.toUtf8().constData(), jobEntry.GetHash(), jobEntry.m_jobRunKey);
}
bool CreateTempRootFolder(QString startFolder, QDir& tempRoot)