diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2018-08-04 18:40:37 -0700 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2018-08-04 18:40:37 -0700 |
| commit | aebb39c65125573386165dee3afbb93d6a18241e (patch) | |
| tree | 626f0ee4c250c9b4dd0615b5ea3eb01773ed8ea7 /ecp5 | |
| parent | dced12cbd2355604279c7277c8a48f584771dfb8 (diff) | |
| parent | 7d5dba3ad378563869657b4330c178ecd8c24931 (diff) | |
| download | nextpnr-aebb39c65125573386165dee3afbb93d6a18241e.tar.gz nextpnr-aebb39c65125573386165dee3afbb93d6a18241e.tar.bz2 nextpnr-aebb39c65125573386165dee3afbb93d6a18241e.zip | |
Merge branch 'master' into slack_histogram
Diffstat (limited to 'ecp5')
| -rw-r--r-- | ecp5/arch.h | 2 | ||||
| -rw-r--r-- | ecp5/main.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ecp5/arch.h b/ecp5/arch.h index cd103b12..6daf543d 100644 --- a/ecp5/arch.h +++ b/ecp5/arch.h @@ -384,7 +384,7 @@ struct PipRange struct ArchArgs { - enum + enum ArchArgsTypes { NONE, LFE5U_25F, diff --git a/ecp5/main.cc b/ecp5/main.cc index dac7a635..dde3ffed 100644 --- a/ecp5/main.cc +++ b/ecp5/main.cc @@ -148,7 +148,7 @@ int main(int argc, char *argv[]) #ifndef NO_GUI if (vm.count("gui")) { Application a(argc, argv); - MainWindow w(std::move(ctx)); + MainWindow w(std::move(ctx),args); w.show(); return a.exec(); |