diff options
Diffstat (limited to 'src/tasks.cc')
| -rw-r--r-- | src/tasks.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/tasks.cc b/src/tasks.cc index 435bef1..68b2476 100644 --- a/src/tasks.cc +++ b/src/tasks.cc @@ -79,8 +79,7 @@ const std::deque<Target>& getTargets(const Settings& settings, std::set<std::shared_ptr<Task>> taskFactory(const BuildConfiguration& config, const Settings& settings, - const std::string& sourceDir, - bool is_self) + const std::string& sourceDir) { std::set<std::shared_ptr<Task>> tasks; @@ -93,16 +92,15 @@ std::set<std::shared_ptr<Task>> taskFactory(const BuildConfiguration& config, { target_type = TargetType::Function; } - else if(targetFile.extension() == ".lib") + else if(targetFile.extension() == ".a") { target_type = TargetType::StaticLibrary; } - else if(targetFile.extension() == ".dll") + else if(targetFile.extension() == ".so") { target_type = TargetType::DynamicLibrary; } - else if(targetFile.extension() == "" || - targetFile.extension() == ".exe") + else if(targetFile.extension() == "") { target_type = TargetType::Executable; } @@ -162,7 +160,7 @@ std::set<std::shared_ptr<Task>> taskFactory(const BuildConfiguration& config, case TargetType::Executable: case TargetType::UnitTest: tasks.insert(std::make_shared<TaskLD>(config, settings, config.target, - objects, sourceDir, is_self)); + objects, sourceDir)); break; case TargetType::Object: @@ -208,7 +206,7 @@ std::set<std::shared_ptr<Task>> getTasks(const Settings& settings, std::find(std::begin(names), std::end(names), target.config.target) != std::end(names)) { std::vector<std::string> objects; - auto t = taskFactory(target.config, settings, target.path, false); + auto t = taskFactory(target.config, settings, target.path); tasks.insert(t.begin(), t.end()); } } |