Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 03:28:20 +02:00
Code Activity

Better handling of disabled projects

Browse source
This commit is contained in:
Brian Fiete 2022-08-26 09:01:40 -07:00
parent 9f084649c7
commit e16be338ea
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
IDE/src/BuildContext.bf
View file

@ -845,7 +845,7 @@ namespace IDE
} }
} }
bool depIsDynLib = (depProject.mGeneralOptions.mTargetType == Project.TargetType.BeefLib) && (depOptions.mBuildOptions.mBuildKind == .DynamicLib); bool depIsDynLib = (depProject.mGeneralOptions.mTargetType == Project.TargetType.BeefLib) && (depOptions?.mBuildOptions.mBuildKind == .DynamicLib);
if (depIsDynLib) if (depIsDynLib)
{ {
if (mImpLibMap.TryGetValue(depProject, var libPath)) if (mImpLibMap.TryGetValue(depProject, var libPath))
@ -858,15 +858,18 @@ namespace IDE
if (depProject.mGeneralOptions.mTargetType == .BeefLib) if (depProject.mGeneralOptions.mTargetType == .BeefLib)
{ {
let depProjectOptions = gApp.GetCurProjectOptions(depProject); let depProjectOptions = gApp.GetCurProjectOptions(depProject);
var linkFlags = scope String(); if (depProjectOptions != null)
gApp.ResolveConfigString(gApp.mPlatformName, workspaceOptions, depProject, depProjectOptions, depProjectOptions.mBuildOptions.mOtherLinkFlags, "link flags", linkFlags); {
if (!linkFlags.IsWhiteSpace) var linkFlags = scope String();
linkLine.Append(linkFlags, " "); gApp.ResolveConfigString(gApp.mPlatformName, workspaceOptions, depProject, depProjectOptions, depProjectOptions.mBuildOptions.mOtherLinkFlags, "link flags", linkFlags);
if (!linkFlags.IsWhiteSpace)
linkLine.Append(linkFlags, " ");
for (let libPath in depProjectOptions.mBuildOptions.mLibPaths) for (let libPath in depProjectOptions.mBuildOptions.mLibPaths)
AddLibPath(libPath, depProject, depProjectOptions); AddLibPath(libPath, depProject, depProjectOptions);
for (let depPath in depProjectOptions.mBuildOptions.mLinkDependencies) for (let depPath in depProjectOptions.mBuildOptions.mLinkDependencies)
AddDepPath(depPath, depProject, depProjectOptions); AddDepPath(depPath, depProject, depProjectOptions);
}
} }
} }
} }