1 files changed, 40 insertions, 27 deletions

diff --git a/src/task.cc b/src/task.cc
index fb50765..ef7731b 100644
--- a/src/task.cc
+++ b/src/task.cc
@@ -3,19 +3,20 @@
 // See accompanying file LICENSE for details.
 #include "task.h"
 
-#include <unistd.h>
 #include <iostream>
+#include <algorithm>
+#include <utility>
 
-Task::Task(const BuildConfiguration& config, const Settings& settings,
-           const std::string& sourceDir)
-	: config(config)
+Task::Task(const ctor::build_configuration& config_, const ctor::settings& settings_,
+           std::string sourceDir_)
+	: config(config_)
 	, output_system(config.system)
-	, settings(settings)
-	, sourceDir(sourceDir)
+	, settings(settings_)
+	, sourceDir(std::move(sourceDir_))
 {
 }
 
-int Task::registerDepTasks(const std::set<std::shared_ptr<Task>>& tasks)
+int Task::registerDepTasks(const std::vector<std::shared_ptr<Task>>& tasks)
 {
 	for(const auto& depStr : depends())
 	{
@@ -24,7 +25,10 @@ int Task::registerDepTasks(const std::set<std::shared_ptr<Task>>& tasks)
 		{
 			if(*task == depStr)
 			{
-				dependsTasks.insert(task);
+				if(std::find(dependsTasks.begin(), dependsTasks.end(), task) == dependsTasks.end())
+				{
+					dependsTasks.push_back(task);
+				}
 				found = true;
 			}
 		}
@@ -41,11 +45,14 @@ int Task::registerDepTasks(const std::set<std::shared_ptr<Task>>& tasks)
 
 bool Task::operator==(const std::string& depStr)
 {
+	std::filesystem::path generated_output = sourceDir;
+	generated_output /= target();
 	return
-		name() == depStr ||
-		target() == depStr ||
-		sourceDir + "/" + target() == depStr ||
-		targetFile().string() == depStr
+		(!derived() && name() == depStr) || // compare to name
+		(!derived() && config.target == depStr) || // compare to stated target (ex. foo.a)
+		target() == depStr || // compare to derived (derived to foo.lib on msvc)
+		generated_output  == depStr || // not sure what this is for?!
+		targetFile().string() == depStr // compare to target output file
 		;
 }
 
@@ -107,54 +114,60 @@ State Task::state() const
 	return task_state.load();
 }
 
-const BuildConfiguration& Task::buildConfig() const
+const ctor::build_configuration& Task::buildConfig() const
 {
 	return config;
 }
 
-TargetType Task::targetType() const
+ctor::target_type Task::targetType() const
 {
 	return target_type;
 }
 
-Language Task::sourceLanguage() const
+ctor::language Task::sourceLanguage() const
 {
 	return source_language;
 }
 
-OutputSystem Task::outputSystem() const
+ctor::output_system Task::outputSystem() const
 {
 	return output_system;
 }
 
 std::string Task::compiler() const
 {
+	const auto& c = ctor::get_configuration();
 	switch(sourceLanguage())
 	{
-	case Language::C:
+	case ctor::language::c:
 		switch(outputSystem())
 		{
-		case OutputSystem::Host:
-			return getConfiguration(cfg::host_cc, "/usr/bin/gcc");
-		case OutputSystem::Build:
-			return getConfiguration(cfg::build_cc, "/usr/bin/gcc");
+		case ctor::output_system::host:
+			return c.get(ctor::cfg::host_cc, "/usr/bin/gcc");
+		case ctor::output_system::build:
+			return c.get(ctor::cfg::build_cc, "/usr/bin/gcc");
 		}
-	case Language::Cpp:
+		break;
+	case ctor::language::cpp:
 		switch(outputSystem())
 		{
-		case OutputSystem::Host:
-			return getConfiguration(cfg::host_cxx, "/usr/bin/g++");
-		case OutputSystem::Build:
-			return getConfiguration(cfg::build_cxx, "/usr/bin/g++");
+		case ctor::output_system::host:
+			return c.get(ctor::cfg::host_cxx, "/usr/bin/g++");
+		case ctor::output_system::build:
+			return c.get(ctor::cfg::build_cxx, "/usr/bin/g++");
 		}
+		break;
 	default:
 		std::cerr << "Unknown CC target type\n";
 		exit(1);
 		break;
 	}
+
+	std::cerr << "Unhandled compiler!\n";
+	exit(1);
 }
 
-std::set<std::shared_ptr<Task>> Task::getDependsTasks()
+std::vector<std::shared_ptr<Task>> Task::getDependsTasks()
 {
 	return dependsTasks;
 }