diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2019-03-19 16:22:09 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2019-03-19 16:22:09 -0700 |
| commit | 5e2fec714cfbff8692d8af4ec8f774738b822ce1 (patch) | |
| tree | a9c38578948ae17b0cc090a8a14c962b1eef7cb4 /py/circuitpy_defns.mk | |
| parent | 8543695f9d6117d758d0cece4a921ce9396d3948 (diff) | |
Move Glyph and BuiltinFont into fontio
It was confusing in displayio.
Fixes #1662
Diffstat (limited to 'py/circuitpy_defns.mk')
| -rw-r--r-- | py/circuitpy_defns.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 09d0a93e2..7a369817a 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -124,7 +124,7 @@ ifeq ($(CIRCUITPY_DIGITALIO),1) SRC_PATTERNS += digitalio/% endif ifeq ($(CIRCUITPY_DISPLAYIO),1) -SRC_PATTERNS += displayio/% terminalio/% +SRC_PATTERNS += displayio/% terminalio/% fontio/% endif ifeq ($(CIRCUITPY_FREQUENCYIO),1) SRC_PATTERNS += frequencyio/% @@ -268,7 +268,7 @@ $(filter $(SRC_PATTERNS), \ digitalio/Direction.c \ digitalio/DriveMode.c \ digitalio/Pull.c \ - displayio/Glyph.c \ + fontio/Glyph.c \ microcontroller/RunMode.c \ math/__init__.c \ supervisor/__init__.c \ @@ -304,7 +304,6 @@ $(filter $(SRC_PATTERNS), \ bitbangio/__init__.c \ busio/OneWire.c \ displayio/Bitmap.c \ - displayio/BuiltinFont.c \ displayio/ColorConverter.c \ displayio/Display.c \ displayio/FourWire.c \ @@ -314,6 +313,8 @@ $(filter $(SRC_PATTERNS), \ displayio/Shape.c \ displayio/TileGrid.c \ displayio/__init__.c \ + fontio/BuiltinFont.c \ + fontio/__init__.c \ gamepad/GamePad.c \ gamepad/__init__.c \ os/__init__.c \ |