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 /gui/ice40/mainwindow.cc | |
| 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 'gui/ice40/mainwindow.cc')
| -rw-r--r-- | gui/ice40/mainwindow.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index 2fa2e561..40b863e9 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -37,7 +37,7 @@ static void initMainResource() { Q_INIT_RESOURCE(nextpnr); } NEXTPNR_NAMESPACE_BEGIN
MainWindow::MainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent)
- : BaseMainWindow(std::move(context), parent), chipArgs(args)
+ : BaseMainWindow(std::move(context), args, parent)
{
initMainResource();
@@ -78,18 +78,11 @@ void MainWindow::createMenu() menuDesign->addAction(actionSaveAsc);
}
-#if defined(_MSC_VER)
-void load_chipdb();
-#endif
-
static const ChipInfoPOD *get_chip_info(const RelPtr<ChipInfoPOD> *ptr) { return ptr->get(); }
-QStringList getSupportedPackages(ArchArgs::ArchArgsTypes chip)
+static QStringList getSupportedPackages(ArchArgs::ArchArgsTypes chip)
{
QStringList packages;
-#if defined(_MSC_VER)
- load_chipdb();
-#endif
const ChipInfoPOD *chip_info;
#ifdef ICE40_HX1K_ONLY
if (chip == ArchArgs::HX1K) {
|