diff options
| author | David Shah <davey1576@gmail.com> | 2018-11-16 10:00:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-16 10:00:13 +0000 |
| commit | cfaa6c0e5de72e25da996f1fcda1d9caa58e4d1f (patch) | |
| tree | c30ff81a4650cb495dad2c96d3fd8bf1ded5a33b | |
| parent | fe4f98f26fb295b3b8d09c3303f1172c91698407 (diff) | |
| parent | 14ad19e0641f27e413ee9684889df755463e238d (diff) | |
| download | nextpnr-cfaa6c0e5de72e25da996f1fcda1d9caa58e4d1f.tar.gz nextpnr-cfaa6c0e5de72e25da996f1fcda1d9caa58e4d1f.tar.bz2 nextpnr-cfaa6c0e5de72e25da996f1fcda1d9caa58e4d1f.zip | |
Merge pull request #119 from cr1901/win-fix
nextpnr-ecp5 Windows Fixes
| -rw-r--r-- | ecp5/bitstream.cc | 2 | ||||
| -rw-r--r-- | ecp5/family.cmake | 4 | ||||
| -rw-r--r-- | ecp5/pio.cc (renamed from ecp5/io.cc) | 2 | ||||
| -rw-r--r-- | ecp5/pio.h (renamed from ecp5/io.h) | 0 |
4 files changed, 6 insertions, 2 deletions
diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc index 5e3ff694..961a3956 100644 --- a/ecp5/bitstream.cc +++ b/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" 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) diff --git a/ecp5/io.cc b/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 |