From e9668ed618b054d323fe848fce2bf1e78840316e Mon Sep 17 00:00:00 2001
From: David Shah <davey1576@gmail.com>
Date: Fri, 13 Jul 2018 12:42:04 +0200
Subject: Fixing hash link problem

Signed-off-by: David Shah <davey1576@gmail.com>
---
 ice40/archdefs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ice40/archdefs.h')

diff --git a/ice40/archdefs.h b/ice40/archdefs.h
index 3252dabf..2bb718f1 100644
--- a/ice40/archdefs.h
+++ b/ice40/archdefs.h
@@ -21,7 +21,7 @@
 #error Include "archdefs.h" via "nextpnr.h" only.
 #endif
 
-#include <boost/functional/hash_fwd.hpp>
+#include <boost/functional/hash.hpp>
 
 NEXTPNR_NAMESPACE_BEGIN
 
-- 
cgit v1.2.3


From 45462ef3a714c0d98fe570d96e6761e2b298c7d0 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Fri, 13 Jul 2018 14:29:03 +0200
Subject: Fix Ui/Decal handling of active/inactive arch objects

Signed-off-by: Clifford Wolf <clifford@clifford.at>
---
 ice40/archdefs.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ice40/archdefs.h')

diff --git a/ice40/archdefs.h b/ice40/archdefs.h
index 2bb718f1..75df678a 100644
--- a/ice40/archdefs.h
+++ b/ice40/archdefs.h
@@ -144,6 +144,7 @@ struct DecalId
         TYPE_GROUP
     } type = TYPE_NONE;
     int32_t index = -1;
+    bool active = false;
 
     bool operator==(const DecalId &other) const { return (type == other.type) && (index == other.index); }
     bool operator!=(const DecalId &other) const { return (type != other.type) || (index != other.index); }
-- 
cgit v1.2.3