From 553c61193605e0ff0fde5aa478e32e5b9c5f3518 Mon Sep 17 00:00:00 2001 From: "William D. Jones" Date: Sat, 3 Nov 2018 13:00:39 -0400 Subject: [PATCH 1/2] Rename io.{h,cc} to pio.{h,cc} to avoid naming conflict with Windows-provided io.h. Signed-off-by: William D. Jones --- ecp5/bitstream.cc | 2 +- ecp5/{io.cc => pio.cc} | 2 +- ecp5/{io.h => pio.h} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename ecp5/{io.cc => pio.cc} (99%) rename ecp5/{io.h => pio.h} (100%) diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc index 95256732..1c150ae2 100644 --- a/ecp5/bitstream.cc +++ b/ecp5/bitstream.cc @@ -26,7 +26,7 @@ #include #include "config.h" -#include "io.h" +#include "pio.h" #include "log.h" #include "util.h" diff --git a/ecp5/io.cc b/ecp5/pio.cc similarity index 99% rename from ecp5/io.cc rename to ecp5/pio.cc index 908caaba..65dcd704 100644 --- a/ecp5/io.cc +++ b/ecp5/pio.cc @@ -17,7 +17,7 @@ * */ -#include "io.h" +#include "pio.h" NEXTPNR_NAMESPACE_BEGIN diff --git a/ecp5/io.h b/ecp5/pio.h similarity index 100% rename from ecp5/io.h rename to ecp5/pio.h From 14ad19e0641f27e413ee9684889df755463e238d Mon Sep 17 00:00:00 2001 From: "William D. Jones" Date: Sat, 3 Nov 2018 13:12:37 -0400 Subject: [PATCH 2/2] Use native PATH environment-variable separator on Windows for PYTHONPATH. Fixes 'Bad address' error in cmake. Signed-off-by: William D. Jones --- ecp5/family.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ecp5/family.cmake b/ecp5/family.cmake index 6322e24e..ebe654af 100644 --- a/ecp5/family.cmake +++ b/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)