allow static dependencies
This commit is contained in:
@@ -76,7 +76,7 @@ namespace Archimedes {
|
||||
skip = false;
|
||||
continue;
|
||||
} else {
|
||||
load(dynamicLoad(it->second), blacklist);
|
||||
load(it->second, blacklist);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,6 +88,12 @@ namespace Archimedes {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool App::load(std::string modulePath, std::list<std::string> blacklist = {}) {
|
||||
Module* m = dynamicLoad(modulePath);
|
||||
return load(m, blacklist);
|
||||
}
|
||||
|
||||
|
||||
void App::unload(std::list<Module*>::iterator it) {
|
||||
|
||||
Module* m = *it;
|
||||
|
||||
@@ -18,6 +18,7 @@ namespace Archimedes {
|
||||
std::list<std::string> toOpen;
|
||||
|
||||
Module* dynamicLoad(std::string);
|
||||
virtual bool load(std::string, std::list<std::string>);
|
||||
virtual bool load(Module*, std::list<std::string>);
|
||||
|
||||
virtual void unload(std::list<Module*>::iterator);
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace Archimedes {
|
||||
|
||||
App* app;
|
||||
|
||||
std::unordered_map<std::string, std::string> deps;
|
||||
std::unordered_map<std::string, std::variant<std::string, Archimedes::Module*>> deps;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user