diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47d60330..562c718d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,8 +64,9 @@ if (EXTERNAL_CHIPDB)
     set(BBASM_MODE "binary")
 elseif (HAS_HASH_EMBED)
     set(BBASM_MODE "embed")
-elseif (WIN32)
+elseif (WIN32 AND NOT HAS_HASH_EMBED)
     set(BBASM_MODE "resource")
+    add_definitions(-DBBAS_ARE_RESOURCES)
 else()
     set(BBASM_MODE "string")
 endif()
diff --git a/common/kernel/embed.cc b/common/kernel/embed.cc
index de7f545c..5ec2b79a 100644
--- a/common/kernel/embed.cc
+++ b/common/kernel/embed.cc
@@ -25,7 +25,7 @@ const void *get_chipdb(const std::string &filename)
     return nullptr;
 }
 
-#elif defined(WIN32)
+#elif defined(BBAS_ARE_RESOURCES)
 
 const void *get_chipdb(const std::string &filename)
 {
diff --git a/common/kernel/embed.h b/common/kernel/embed.h
index 5f2754f8..dcbb4082 100644
--- a/common/kernel/embed.h
+++ b/common/kernel/embed.h
@@ -23,7 +23,7 @@
 #include "nextpnr.h"
 NEXTPNR_NAMESPACE_BEGIN
 
-#if !defined(EXTERNAL_CHIPDB_ROOT) && !defined(WIN32)
+#if !defined(EXTERNAL_CHIPDB_ROOT) && !defined(BBAS_ARE_RESOURCES)
 
 struct EmbeddedFile
 {