diff options
| author | myrtle <gatecat@ds0.me> | 2022-12-21 07:09:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-21 07:09:27 +0000 |
| commit | b101f0092cea6f4195307ebcd693286872ed8288 (patch) | |
| tree | ca5cfbeec3e265a7c43654af2089399a020f1cff | |
| parent | 3ea3a931ca2b9b7228bf241a3fd6cbf861e40696 (diff) | |
| parent | d6cbe4b7f83a083ac174d7f8b0dd26eca61ebe53 (diff) | |
| download | nextpnr-b101f0092cea6f4195307ebcd693286872ed8288.tar.gz nextpnr-b101f0092cea6f4195307ebcd693286872ed8288.tar.bz2 nextpnr-b101f0092cea6f4195307ebcd693286872ed8288.zip | |
Merge pull request #1067 from yrabbit/wasm
gowin: fix build for wasm
| -rw-r--r-- | gowin/arch.cc | 8 | ||||
| -rw-r--r-- | gowin/gfx.cc | 2 | ||||
| -rw-r--r-- | gowin/gfx.h | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/gowin/arch.cc b/gowin/arch.cc index 461b64c8..8c908b04 100644 --- a/gowin/arch.cc +++ b/gowin/arch.cc @@ -523,6 +523,7 @@ void Arch::setBelDecal(BelId bel, DecalXY active, DecalXY inactive) void Arch::setDefaultDecals(void) { +#ifndef NO_GUI for (BelId bel : getBels()) { gfxSetBelDefaultDecal(this, bel_info(bel)); } @@ -533,6 +534,7 @@ void Arch::setDefaultDecals(void) gfxSetWireDefaultDecal(this, wire_info(wire)); } fixClockSpineDecals(); +#endif } void Arch::setGroupDecal(GroupId group, DecalXY decalxy) @@ -1125,8 +1127,10 @@ Arch::Arch(ArchArgs args) : args(args) addDecalGraphic(IdString(), GraphicElement()); if (args.gui) { +#ifndef NO_GUI // decals gfxCreateBelDecals(this); +#endif } // setup package @@ -1216,11 +1220,13 @@ Arch::Arch(ArchArgs args) : args(args) int col = i % db->cols; const TilePOD *tile = db->grid[i].get(); if (args.gui) { +#ifndef NO_GUI // CRU decal snprintf(buf, 32, "R%dC%d_CRU", row + 1, col + 1); grpname = id(buf); addGroup(grpname); setGroupDecal(grpname, gfxGetCruGroupDecalXY(col, row)); +#endif } // setup wires const PairPOD *pips[2] = {tile->pips.get(), tile->clock_pips.get()}; @@ -1420,8 +1426,10 @@ Arch::Arch(ArchArgs args) : args(args) snprintf(buf, 32, "R%dC%d_LUT_GRP%d", row + 1, col + 1, z); grpname = id(buf); if (args.gui) { +#ifndef NO_GUI addGroup(grpname); setGroupDecal(grpname, gfxGetLutGroupDecalXY(col, row, z >> 1)); +#endif } } break; diff --git a/gowin/gfx.cc b/gowin/gfx.cc index 5abb1399..a06df6f8 100644 --- a/gowin/gfx.cc +++ b/gowin/gfx.cc @@ -24,6 +24,7 @@ NEXTPNR_NAMESPACE_BEGIN +#ifndef NO_GUI // LUTs const float lut_w = 0.6732 - 0.6386; const float lut_h = 0.9392 - 0.9074; @@ -5824,5 +5825,6 @@ DecalXY gfxGetCruGroupDecalXY(int x, int y) decalxy.y = y; return decalxy; } +#endif // NO_GUI NEXTPNR_NAMESPACE_END diff --git a/gowin/gfx.h b/gowin/gfx.h index 623b9fb2..4c798ed9 100644 --- a/gowin/gfx.h +++ b/gowin/gfx.h @@ -24,6 +24,7 @@ NEXTPNR_NAMESPACE_BEGIN +#ifndef NO_GUI void gfxCreateBelDecals(Arch *arch); void gfxSetBelDefaultDecal(Arch *arch, BelInfo &bel); void gfxSetIOBWireDecals(Arch *arch, BelInfo &bel); @@ -32,6 +33,7 @@ void gfxSetPipDefaultDecal(Arch *arch, PipInfo &pip); void gfxSetWireDefaultDecal(Arch *arch, WireInfo &wire); DecalXY gfxGetLutGroupDecalXY(int x, int y, int z); DecalXY gfxGetCruGroupDecalXY(int x, int y); +#endif NEXTPNR_NAMESPACE_END |