Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-12 05:14:10 +02:00
Code Activity

Removed linking for static lib builds

Browse source
This commit is contained in:
Brian Fiete 2021-06-28 05:47:37 -07:00
parent c4bb50b340
commit 42bee45635
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
IDE/src/BuildContext.bf
View file

@ -180,7 +180,6 @@ namespace IDE
#endif #endif
//String error = scope String(); //String error = scope String();
bool isTest = options.mBuildOptions.mBuildKind == .Test; bool isTest = options.mBuildOptions.mBuildKind == .Test;
bool isExe = ((project.mGeneralOptions.mTargetType != Project.TargetType.BeefLib) && (project.mGeneralOptions.mTargetType != Project.TargetType.BeefTest)) || (isTest); bool isExe = ((project.mGeneralOptions.mTargetType != Project.TargetType.BeefLib) && (project.mGeneralOptions.mTargetType != Project.TargetType.BeefTest)) || (isTest);
if (!isExe) if (!isExe)
@ -299,6 +298,9 @@ namespace IDE
bool isExe = ((project.mGeneralOptions.mTargetType != Project.TargetType.BeefLib) && (project.mGeneralOptions.mTargetType != Project.TargetType.BeefTest)) || (isTest); 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.BeefDynLib;
if (options.mBuildOptions.mBuildKind == .StaticLib)
isExe = false;
if (isExe || isDynLib) if (isExe || isDynLib)
{ {
CopyLibFiles(targetPath, workspaceOptions, options); CopyLibFiles(targetPath, workspaceOptions, options);
@ -795,6 +797,9 @@ namespace IDE
bool isTest = options.mBuildOptions.mBuildKind == .Test; bool isTest = options.mBuildOptions.mBuildKind == .Test;
bool isExe = ((project.mGeneralOptions.mTargetType != Project.TargetType.BeefLib) && (project.mGeneralOptions.mTargetType != Project.TargetType.BeefTest)) || (isTest); bool isExe = ((project.mGeneralOptions.mTargetType != Project.TargetType.BeefLib) && (project.mGeneralOptions.mTargetType != Project.TargetType.BeefTest)) || (isTest);
if (options.mBuildOptions.mBuildKind == .StaticLib)
isExe = false;
if (isExe) if (isExe)
{ {
String linkLine = scope String(); String linkLine = scope String();