caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11 from mmicko/project_load

Browse Source 
preserve command line parameters for project load
This commit is contained in:
Miodrag Milanović 2018-08-02 08:24:49 -07:00 committed by GitHub
commit e46209e734
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ice40/main.cc
View File

@ -168,6 +168,11 @@ int main(int argc, char *argv[])
pt::read_json(filename, root);
log_info("Loading project %s...\n", filename.c_str());
log_break();
bool isLoadingGui = vm.count("gui") > 0;
std::string ascOutput;
if (vm.count("asc"))
ascOutput = vm["asc"].as<std::string>();
vm.clear();
int version = root.get<int>("project.version");
@ -199,6 +204,10 @@ int main(int argc, char *argv[])
if (params.count("seed"))
vm.insert(std::make_pair("seed", po::variable_value(params.get<int>("seed"), false)));
}
if (!ascOutput.empty())
vm.insert(std::make_pair("asc", po::variable_value(ascOutput, false)));
if (isLoadingGui)
vm.insert(std::make_pair("gui", po::variable_value()));
po::notify(vm);
} catch (...) {
log_error("Error loading project file.\n");