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

Fix using references to projects outside the main project

Browse Source 
#397
This commit is contained in:
Wojtek Figat
2021-03-30 22:07:40 +02:00
parent 9581f7b10e
commit f8d6f8ffb5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -246,7 +246,7 @@ namespace Flax.Build
// Get all modules aggregated into all binary modules used in all configurations of this target // Get all modules aggregated into all binary modules used in all configurations of this target
foreach (var configurationData in mainProject.Configurations) foreach (var configurationData in mainProject.Configurations)
{ {
var configurationBinaryModules = GetBinaryModules(rootProject, configurationData.Target, configurationData.Modules); var configurationBinaryModules = GetBinaryModules(projectInfo, configurationData.Target, configurationData.Modules);
foreach (var configurationBinaryModule in configurationBinaryModules) foreach (var configurationBinaryModule in configurationBinaryModules)
{ {
// Skip if none of the included binary modules is inside the project workspace (eg. merged external binary modules from engine to game project) // Skip if none of the included binary modules is inside the project workspace (eg. merged external binary modules from engine to game project)
@@ -272,7 +272,7 @@ namespace Flax.Build
{ {
var referenceBuildOptions = GetBuildOptions(referenceTarget, configurationData.TargetBuildOptions.Platform, configurationData.TargetBuildOptions.Toolchain, configurationData.Architecture, configurationData.Configuration, reference.Project.ProjectFolderPath); var referenceBuildOptions = GetBuildOptions(referenceTarget, configurationData.TargetBuildOptions.Platform, configurationData.TargetBuildOptions.Toolchain, configurationData.Architecture, configurationData.Configuration, reference.Project.ProjectFolderPath);
var referenceModules = CollectModules(rules, referenceBuildOptions.Platform, referenceTarget, referenceBuildOptions, referenceBuildOptions.Toolchain, referenceBuildOptions.Architecture, referenceBuildOptions.Configuration); var referenceModules = CollectModules(rules, referenceBuildOptions.Platform, referenceTarget, referenceBuildOptions, referenceBuildOptions.Toolchain, referenceBuildOptions.Architecture, referenceBuildOptions.Configuration);
var referenceBinaryModules = GetBinaryModules(rootProject, referenceTarget, referenceModules); var referenceBinaryModules = GetBinaryModules(projectInfo, referenceTarget, referenceModules);
foreach (var binaryModule in referenceBinaryModules) foreach (var binaryModule in referenceBinaryModules)
{ {
project.Defines.Add(binaryModule.Key.ToUpperInvariant() + "_API="); project.Defines.Add(binaryModule.Key.ToUpperInvariant() + "_API=");