Merge pull request #119 from cr1901/win-fix

nextpnr-ecp5 Windows Fixes

ecp5/bitstream.cc

@@ -26,7 +26,7 @@
 #include <streambuf>
 #include <boost/algorithm/string/predicate.hpp>
 #include "config.h"
-#include "io.h"
+#include "pio.h"
 #include "log.h"
 #include "util.h"
 

ecp5/family.cmake

@@ -18,7 +18,11 @@ file(MAKE_DIRECTORY ecp5/chipdbs/)
 add_library(ecp5_chipdb OBJECT ecp5/chipdbs/)
 target_compile_definitions(ecp5_chipdb PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family})
 target_include_directories(ecp5_chipdb PRIVATE ${family}/)
+if (WIN32)
+set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=\"${TRELLIS_ROOT}/libtrellis\;${TRELLIS_ROOT}/util/common\"")
+else()
 set(ENV_CMD ${CMAKE_COMMAND} -E env "PYTHONPATH=${TRELLIS_ROOT}/libtrellis:${TRELLIS_ROOT}/util/common")
+endif()
 if (MSVC)
     target_sources(ecp5_chipdb PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/resource/embed.cc)
     set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ecp5/resources/chipdb.rc PROPERTIES LANGUAGE RC)

ecp5/pio.cc

@@ -17,7 +17,7 @@
  *
  */
 
-#include "io.h"
+#include "pio.h"
 
 NEXTPNR_NAMESPACE_BEGIN