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

Merge remote-tracking branch 'origin/master' into navigation-features

Browse Source
This commit is contained in:
Wojtek Figat
2020-12-22 12:13:26 +01:00
parent 5e77925492 70d0c0ea8a
commit f25064fae8
68 changed files with 1006 additions and 2106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Tools/Flax.Build/Build/Builder.Projects.cs
View File

@@ -476,6 +476,25 @@ namespace Flax.Build
"System.Core",
};
SetupProjectConfigurations(project, rootProject);
if (project.Configurations.Count == 0)
{
// Hardcoded dummy configuration even if platform tools are missing for this platform
var platform = Platform.BuildPlatform;
var architecture = TargetArchitecture.x64;
var configuration = TargetConfiguration.Debug;
project.Configurations.Add(new Project.ConfigurationData
{
Platform = platform.Target,
PlatformName = platform.Target.ToString(),
Architecture = architecture,
ArchitectureName = architecture.ToString(),
Configuration = configuration,
ConfigurationName = configuration.ToString(),
Target = target,
TargetBuildOptions = GetBuildOptions(target, platform, null, architecture, configuration, project.WorkspaceRootPath),
Modules = new Dictionary<Module, BuildOptions>(),
});
}
var c = project.Configurations[0];
c.Name = "Debug|AnyCPU";
c.Text = "Debug";

2
Source/Tools/Flax.Build/Build/NativeCpp/Builder.NativeCpp.cs
View File

@@ -946,7 +946,7 @@ namespace Flax.Build
{
using (new ProfileEventScope(reference.Project.Name))
{
if (Configuration.BuildBindingsOnly || reference.Project.IsCSharpOnlyProject)
if (Configuration.BuildBindingsOnly || reference.Project.IsCSharpOnlyProject || !platform.HasRequiredSDKsInstalled)
{
BuildTargetReferenceNativeCppBindingsOnly(buildContext, buildData, reference);
}

2
Source/Tools/Flax.Build/Platforms/Android/AndroidNdk.cs
View File

@@ -37,7 +37,7 @@ namespace Flax.Build.Platforms
if (string.IsNullOrEmpty(sdkPath))
{
// Look for ndk installed side-by-side with an sdk
if (AndroidSdk.Instance.IsValid)
if (AndroidSdk.Instance.IsValid && Directory.Exists(Path.Combine(AndroidSdk.Instance.RootPath, "ndk")))
{
var subdirs = Directory.GetDirectories(Path.Combine(AndroidSdk.Instance.RootPath, "ndk"));
if (subdirs.Length != 0)