diff options
| author | gatecat <gatecat@ds0.me> | 2021-03-15 17:00:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 17:00:52 +0000 |
| commit | a8e35062c6a1a21838346dd7536bb2fcc7f820ed (patch) | |
| tree | c5466a8ed8f9108410561eb8d9d9ff5e2810d297 /fpga_interchange/arch.h | |
| parent | 3cf4a336665e07f8d210aa9d3336f3d5b0e82ea7 (diff) | |
| parent | fe4608386eb163c70a75ed84beb07516af378b36 (diff) | |
| download | nextpnr-a8e35062c6a1a21838346dd7536bb2fcc7f820ed.tar.gz nextpnr-a8e35062c6a1a21838346dd7536bb2fcc7f820ed.tar.bz2 nextpnr-a8e35062c6a1a21838346dd7536bb2fcc7f820ed.zip | |
Merge pull request #621 from litghost/fix_header_nightmare
Split nextpnr.h to allow for linear inclusion.
Diffstat (limited to 'fpga_interchange/arch.h')
| -rw-r--r-- | fpga_interchange/arch.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/fpga_interchange/arch.h b/fpga_interchange/arch.h index 16c79e8a..a171ba55 100644 --- a/fpga_interchange/arch.h +++ b/fpga_interchange/arch.h @@ -20,16 +20,18 @@ * */ -#ifndef NEXTPNR_H -#error Include "arch.h" via "nextpnr.h" only. -#endif +#ifndef FPGA_INTERCHANGE_ARCH_H +#define FPGA_INTERCHANGE_ARCH_H #include <boost/iostreams/device/mapped_file.hpp> - #include <iostream> - #include <regex> + +#include "arch_api.h" #include "constraints.h" +#include "nextpnr_types.h" +#include "relptr.h" + #include "dedicated_interconnect.h" #include "site_router.h" @@ -37,8 +39,6 @@ NEXTPNR_NAMESPACE_BEGIN /**** Everything in this section must be kept in sync with chipdb.py ****/ -#include "relptr.h" - // Flattened site indexing. // // To enable flat BelId.z spaces, every tile and sites within that tile are @@ -1742,3 +1742,5 @@ struct Arch : ArchAPI<ArchRanges> }; NEXTPNR_NAMESPACE_END + +#endif /* FPGA_INTERCHANGE_ARCH_H */ |