Переглянути джерело

Removed linking for static lib builds

Brian Fiete 4 роки тому
батько
коміт
42bee45635
1 змінених файлів з 6 додано та 1 видалено
  1. 6 1
      IDE/src/BuildContext.bf

+ 6 - 1
IDE/src/BuildContext.bf

@@ -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();