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

Merge remote-tracking branch 'origin/1.1' into linux-editor

Browse Source 
# Conflicts:
#	Source/Engine/Core/Math/BoundingSphere.cs
#	Source/Engine/Debug/DebugDraw.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
#	Source/Engine/Platform/Win32/Win32Platform.h
This commit is contained in:
Wojtek Figat
2021-02-23 22:32:17 +01:00
parent cf3ac7a26e 3ddd64df2a
commit 5a9ca6f130
129 changed files with 6085 additions and 1891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,17 +246,26 @@ namespace Flax.Build
}
}
private static IGrouping<string, Module>[] GetBinaryModules(RulesAssembly rules, Target target, Dictionary<Module, BuildOptions> buildModules)
private static IGrouping<string, Module>[] GetBinaryModules(ProjectInfo project, Target target, Dictionary<Module, BuildOptions> buildModules)
{
var modules = new List<Module>();
switch (target.LinkType)
{
case TargetLinkType.Monolithic:
// Include all modules
modules.AddRange(buildModules.Keys);
break;
case TargetLinkType.Modular:
modules.AddRange(target.Modules.Select(rules.GetModule));
{
// Include all modules from the project that contains this target
var sourcePath = Path.Combine(project.ProjectFolderPath, "Source");
foreach (var module in buildModules.Keys)
{
if (module.FolderPath.StartsWith(sourcePath))
modules.Add(module);
}
break;
}
default: throw new ArgumentOutOfRangeException();
}
modules.RemoveAll(x => x == null || string.IsNullOrEmpty(x.BinaryModuleName));
@@ -672,7 +681,7 @@ namespace Flax.Build
using (new ProfileEventScope("SetupBinaryModules"))
{
// Collect all binary modules to include into target
buildData.BinaryModules = GetBinaryModules(rules, target, buildData.Modules);
buildData.BinaryModules = GetBinaryModules(project, target, buildData.Modules);
// Inject binary modules symbols import/export defines
for (int i = 0; i < buildData.BinaryModules.Length; i++)
@@ -1005,7 +1014,7 @@ namespace Flax.Build
using (new ProfileEventScope("SetupBinaryModules"))
{
// Collect all binary modules to include into target
buildData.BinaryModules = GetBinaryModules(rules, target, buildData.Modules);
buildData.BinaryModules = GetBinaryModules(project, target, buildData.Modules);
}
// Generate code for binary modules included in the target