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

Removed "Dynamic Library" target type, replaced by Build Kind

Browse source
This commit is contained in:
Brian Fiete 2021-06-28 09:44:47 -07:00
parent 1c1cb1ac49
commit 7ae8599916
8 changed files with 163 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

19
IDE/src/BuildContext.bf
View file

@ -296,7 +296,7 @@ namespace IDE
bool isTest = options.mBuildOptions.mBuildKind == .Test;
bool isExe = ((project.mGeneralOptions.mTargetType != Project.TargetType.BeefLib) && (project.mGeneralOptions.mTargetType != Project.TargetType.BeefTest)) || (isTest);
bool isDynLib = project.mGeneralOptions.mTargetType == Project.TargetType.BeefDynLib;
bool isDynLib = (project.mGeneralOptions.mTargetType == Project.TargetType.BeefLib) && (options.mBuildOptions.mBuildKind == .DynamicLib);
if (options.mBuildOptions.mBuildKind == .StaticLib)
isExe = false;
@ -525,7 +525,7 @@ namespace IDE
bool isTest = options.mBuildOptions.mBuildKind == .Test;
bool isExe = ((project.mGeneralOptions.mTargetType != Project.TargetType.BeefLib) && (project.mGeneralOptions.mTargetType != Project.TargetType.BeefTest)) || (isTest);
bool isDynLib = project.mGeneralOptions.mTargetType == Project.TargetType.BeefDynLib;
bool isDynLib = (project.mGeneralOptions.mTargetType == Project.TargetType.BeefLib) && (options.mBuildOptions.mBuildKind == .DynamicLib);
if (isExe || isDynLib)
{
@ -761,7 +761,8 @@ namespace IDE
}
}
if (depProject.mGeneralOptions.mTargetType == .BeefDynLib)
bool depIsDynLib = (depProject.mGeneralOptions.mTargetType == Project.TargetType.BeefLib) && (depOptions.mBuildOptions.mBuildKind == .DynamicLib);
if (depIsDynLib)
{
if (mImpLibMap.TryGetValue(depProject, var libPath))
{
@ -797,9 +798,9 @@ namespace IDE
bool isTest = options.mBuildOptions.mBuildKind == .Test;
bool isExe = ((project.mGeneralOptions.mTargetType != Project.TargetType.BeefLib) && (project.mGeneralOptions.mTargetType != Project.TargetType.BeefTest)) || (isTest);
if (options.mBuildOptions.mBuildKind == .StaticLib)
isExe = false;
if (options.mBuildOptions.mBuildKind == .DynamicLib)
isExe = true;
if (isExe)
{
String linkLine = scope String();
@ -814,7 +815,7 @@ namespace IDE
linkLine.Append("-subsystem:windows ");
else if (project.mGeneralOptions.mTargetType == .C_GUIApplication)
linkLine.Append("-subsystem:console ");
else if (project.mGeneralOptions.mTargetType == .BeefDynLib)
else if (project.mGeneralOptions.mTargetType == .BeefLib)
{
linkLine.Append("-dll ");
@ -885,7 +886,7 @@ namespace IDE
linkLine.Append("-nologo ");
if ((project.mGeneralOptions.mTargetType == .BeefDynLib) && (workspaceOptions.mAllowHotSwapping) && (is64Bit))
if ((project.mGeneralOptions.mTargetType == .BeefLib) && (workspaceOptions.mAllowHotSwapping) && (is64Bit))
{
// This helps to ensure that DLLs have enough hot swapping space after them
int nameHash = targetPath.GetHashCode();
@ -1204,7 +1205,7 @@ namespace IDE
Directory.CreateDirectory(targetDir).IgnoreError();
}
if (project.mGeneralOptions.mTargetType == .BeefDynLib)
if (project.mGeneralOptions.mTargetType == .BeefLib)
{
if (targetPath.EndsWith(".dll", .InvariantCultureIgnoreCase))
{