diff options
author | Miodrag Milanović <mmicko@gmail.com> | 2018-08-08 11:22:01 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-08 11:22:01 -0700 |
commit | bc378fc3e4bbb16251f4076384eb6aaf25ef79e3 (patch) | |
tree | 18ff4129f05a457f0afaf8edcef90fe73252ad24 /gui | |
parent | b326b03a5261a824f428fe0811a5376c8758b929 (diff) | |
parent | 61bce47f3cb7b4adf1d5292b3c431ca4048ad038 (diff) | |
download | nextpnr-bc378fc3e4bbb16251f4076384eb6aaf25ef79e3.tar.gz nextpnr-bc378fc3e4bbb16251f4076384eb6aaf25ef79e3.tar.bz2 nextpnr-bc378fc3e4bbb16251f4076384eb6aaf25ef79e3.zip |
Merge pull request #46 from YosysHQ/use_settings
Use settings for json and pcf
Diffstat (limited to 'gui')
-rw-r--r-- | gui/ecp5/mainwindow.h | 1 | ||||
-rw-r--r-- | gui/ice40/mainwindow.cc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/gui/ecp5/mainwindow.h b/gui/ecp5/mainwindow.h index aa1af17b..f85c2abc 100644 --- a/gui/ecp5/mainwindow.h +++ b/gui/ecp5/mainwindow.h @@ -52,7 +52,6 @@ class MainWindow : public BaseMainWindow ArchArgs chipArgs;
- std::string currentProj;
std::string currentBaseConfig;
};
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index 35ad5768..bf6e4b4c 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -150,7 +150,7 @@ void MainWindow::load_pcf(std::string filename) disableActions();
currentPCF = filename;
std::ifstream f(filename);
- if (apply_pcf(ctx.get(), f)) {
+ if (apply_pcf(ctx.get(), filename, f)) {
log("Loading PCF successful.\n");
actionPack->setEnabled(true);
} else {
|