From 4c06b9be1d2420100d0c3b2533ecebeece183187 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sun, 8 Jul 2018 19:27:42 +0200
Subject: Python executable filename could be different

---
 ice40/family.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ice40/family.cmake b/ice40/family.cmake
index f7a27ffb..e6cefecb 100644
--- a/ice40/family.cmake
+++ b/ice40/family.cmake
@@ -22,7 +22,7 @@ if (MSVC)
         set(DEV_CC_DB ${CMAKE_CURRENT_SOURCE_DIR}/ice40/chipdbs/chipdb-${dev}.bin)
         set(DEV_PORTS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ice40/portpins.inc)
         add_custom_command(OUTPUT ${DEV_CC_DB}
-                COMMAND python3 ${DB_PY} -b -p ${DEV_PORTS_INC} ${DEV_TXT_DB} > ${DEV_CC_DB}
+                COMMAND ${PYTHON_EXECUTABLE} ${DB_PY} -b -p ${DEV_PORTS_INC} ${DEV_TXT_DB} > ${DEV_CC_DB}
                 DEPENDS ${DEV_TXT_DB} ${DB_PY}
                 )
         target_sources(ice40_chipdb PRIVATE ${DEV_CC_DB})
@@ -38,7 +38,7 @@ else()
         set(DEV_CC_DB ${CMAKE_CURRENT_SOURCE_DIR}/ice40/chipdbs/chipdb-${dev}.cc)
         set(DEV_PORTS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ice40/portpins.inc)
         add_custom_command(OUTPUT ${DEV_CC_DB}
-                COMMAND python3 ${DB_PY} -c -p ${DEV_PORTS_INC} ${DEV_TXT_DB} > ${DEV_CC_DB}.new
+                COMMAND ${PYTHON_EXECUTABLE} ${DB_PY} -c -p ${DEV_PORTS_INC} ${DEV_TXT_DB} > ${DEV_CC_DB}.new
                 COMMAND mv ${DEV_CC_DB}.new ${DEV_CC_DB}
                 DEPENDS ${DEV_TXT_DB} ${DB_PY}
                 )
-- 
cgit v1.2.3


From 044e46b0adbab8beaeee208e7e0f88dee1fdeae9 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sun, 8 Jul 2018 20:24:30 +0200
Subject: cleared a warning and add note for python

---
 README.md           |  1 +
 gui/designwidget.cc | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 66e2bcc2..195f08c3 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ Prequisites
  - Modern C++11 compiler (`clang-format` required for development)
  - Qt5 or later (`qt5-default` for Ubuntu 16.04)
  - Python 3.5 or later, including development libraries (`python3-dev` for Ubuntu)
+    - on Windows make sure to install same version as supported by [vcpkg](https://github.com/Microsoft/vcpkg/blob/master/ports/python3/CONTROL)
  - Boost libraries (`libboost-dev` or `libboost-all-dev` for Ubuntu)
  - Icestorm, with chipdbs installed in `/usr/local/share/icebox`
  - Latest git Yosys is required to synthesise the demo design
diff --git a/gui/designwidget.cc b/gui/designwidget.cc
index 1a5e2962..4922074b 100644
--- a/gui/designwidget.cc
+++ b/gui/designwidget.cc
@@ -266,19 +266,19 @@ void DesignWidget::clearProperties()
     idToProperty.clear();
 }
 
-void DesignWidget::onItemClicked(QTreeWidgetItem *item, int pos)
+void DesignWidget::onItemClicked(QTreeWidgetItem *clickItem, int pos)
 {
-    if (!item->parent())
+    if (!clickItem->parent())
         return;
 
-    ElementType type = static_cast<ElementTreeItem *>(item)->getType();
+    ElementType type = static_cast<ElementTreeItem *>(clickItem)->getType();
     if (type == ElementType::NONE) {
         return;
     }
 
     clearProperties();
     if (type == ElementType::BEL) {
-        IdString c = static_cast<IdStringTreeItem *>(item)->getData();
+        IdString c = static_cast<IdStringTreeItem *>(clickItem)->getData();
         BelId bel = ctx->getBelByName(c);
 
         QtProperty *topItem = groupManager->addProperty("Bel");
@@ -305,7 +305,7 @@ void DesignWidget::onItemClicked(QTreeWidgetItem *item, int pos)
         topItem->addSubProperty(conflictItem);
 
     } else if (type == ElementType::WIRE) {
-        IdString c = static_cast<IdStringTreeItem *>(item)->getData();
+        IdString c = static_cast<IdStringTreeItem *>(clickItem)->getData();
         WireId wire = ctx->getWireByName(c);
 
         QtProperty *topItem = groupManager->addProperty("Wire");
@@ -379,7 +379,7 @@ void DesignWidget::onItemClicked(QTreeWidgetItem *item, int pos)
         }
 
     } else if (type == ElementType::PIP) {
-        IdString c = static_cast<IdStringTreeItem *>(item)->getData();
+        IdString c = static_cast<IdStringTreeItem *>(clickItem)->getData();
         PipId pip = ctx->getPipByName(c);
 
         QtProperty *topItem = groupManager->addProperty("Pip");
@@ -426,7 +426,7 @@ void DesignWidget::onItemClicked(QTreeWidgetItem *item, int pos)
         delayItem->addSubProperty(avgDelayItem);
 
     } else if (type == ElementType::NET) {
-        IdString c = static_cast<IdStringTreeItem *>(item)->getData();
+        IdString c = static_cast<IdStringTreeItem *>(clickItem)->getData();
         NetInfo *net = ctx->nets.at(c).get();
 
         QtProperty *topItem = groupManager->addProperty("Net");
@@ -511,7 +511,7 @@ void DesignWidget::onItemClicked(QTreeWidgetItem *item, int pos)
         }
 
     } else if (type == ElementType::CELL) {
-        IdString c = static_cast<IdStringTreeItem *>(item)->getData();
+        IdString c = static_cast<IdStringTreeItem *>(clickItem)->getData();
         CellInfo *cell = ctx->cells.at(c).get();
 
         QtProperty *topItem = groupManager->addProperty("Cell");
-- 
cgit v1.2.3