GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compilation errors fixing

Browse Source
This commit is contained in:
Wojtek Figat
2025-08-02 17:05:13 +02:00
parent b26d6ea108
commit 744c94b3cc
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Content/Asset.cpp
View File

@@ -279,7 +279,7 @@ void Asset::OnDeleteObject()
const bool wasMarkedToDelete = _deleteFileOnUnload != 0;
#if USE_EDITOR
const String path = wasMarkedToDelete ? GetPath() : String::Empty;
const String path = wasMarkedToDelete ? GetPath() : StringView::Empty;
#endif
const Guid id = GetID();

2
Source/Engine/Content/BinaryAsset.cpp
View File

@@ -467,7 +467,7 @@ void BinaryAsset::OnDeleteObject()
StringView BinaryAsset::GetPath() const
{
#if USE_EDITOR
return Storage ? Storage->GetPath() : StringView::Empty;
return Storage ? StringView(Storage->GetPath()) : StringView::Empty;
#else
// In build all assets are packed into packages so use ID for original path lookup
return Content::GetRegistry()->GetEditorAssetPath(_id);

2
Source/Engine/Platform/Linux/LinuxPlatform.cpp
View File

@@ -1838,7 +1838,7 @@ void LinuxPlatform::Sleep(int32 milliseconds)
void LinuxPlatform::Yield()
{
pthread_yield();
sched_yield();
}
double LinuxPlatform::GetTimeSeconds()

4
Source/ThirdParty/tracy/tracy.Build.cs vendored
View File

@@ -78,7 +78,11 @@ public class tracy : ThirdPartyModule
if (graphicsOptions.PrivateDependencies.Contains("GraphicsDeviceDX12"))
options.PrivateDefinitions.Add("TRACY_GPU_D3D12");
if (graphicsOptions.PrivateDependencies.Contains("GraphicsDeviceVulkan"))
{
options.PrivateDefinitions.Add("TRACY_GPU_VULKAN");
if (VulkanSdk.Instance.TryGetIncludePath(options.Platform.Target, out var includesFolderPath))
options.PrivateIncludePaths.Add(includesFolderPath);
}
}
}