Fix libportal include path and glib include path on Ubuntu 22
This commit is contained in:
@@ -3178,7 +3178,7 @@ Array<LinuxPlatform::StackFrame> LinuxPlatform::GetStackFrames(int32 skipCount,
|
||||
#include "Engine/Platform/Linux/IncludeX11.h"
|
||||
|
||||
#if PLATFORM_SDL
|
||||
#include <libportal/portal-enums.h>
|
||||
#include <portal-enums.h>
|
||||
#include <libportal/screenshot.h>
|
||||
|
||||
namespace PortalImpl
|
||||
|
||||
+3
-2
@@ -31,7 +31,8 @@ public class libportal : EngineDepsModule
|
||||
|
||||
options.PublicIncludePaths.Add("/usr/include/glib-2.0");
|
||||
options.PublicIncludePaths.Add("/usr/lib/glib-2.0/include");
|
||||
|
||||
if (options.Architecture == TargetArchitecture.x64)
|
||||
options.PublicIncludePaths.Add("/usr/lib/x86_64-linux-gnu/glib-2.0/include");
|
||||
|
||||
//options.SourceFiles.Add(Path.Combine(FolderPath, "portal-enums.c"));
|
||||
options.SourceFiles.AddRange(Directory.GetFiles(FolderPath, "*.c", SearchOption.TopDirectoryOnly));
|
||||
@@ -39,6 +40,6 @@ public class libportal : EngineDepsModule
|
||||
default: throw new InvalidPlatformException(options.Platform.Target);
|
||||
}
|
||||
|
||||
options.PublicIncludePaths.Add(Path.Combine(Globals.EngineRoot, @"Source\ThirdParty\libportal\include"));
|
||||
options.PublicIncludePaths.Add(Path.Combine(Globals.EngineRoot, @"Source/ThirdParty/libportal/include"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
// Copyright (c) Wojciech Figat. All rights reserved.
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using Flax.Build;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user