Skip to content

Commit

Permalink
Decouple BUTTON_SCAN from MINIMAL
Browse files Browse the repository at this point in the history
Allows enabling it outside of a MINIMAL build
Also, gate it behind a KOBO check, as it doesn't make sense anywhere
else.
  • Loading branch information
NiLuJe committed Oct 24, 2023
1 parent cad9acf commit af1a15b
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,13 @@ else
ifdef UNIFONT
FEATURES_CPPFLAGS+=-DFBINK_WITH_UNIFONT
endif
# button_scan has been deprecated, so it's now optional
ifdef KOBO
ifdef BUTTON_SCAN
WITH_BUTTON_SCAN:=True
FEATURES_CPPFLAGS+=-DFBINK_WITH_BUTTON_SCAN
endif
endif
endif

# Manage modular MINIMAL builds...
Expand Down Expand Up @@ -464,13 +471,15 @@ ifdef MINIMAL
endif

# Support tweaking a MINIMAL build to still include button scan support
ifdef BUTTON_SCAN
# Make sure we actually have drawing support
ifndef DRAW
DRAW:=1
ifdef KOBO
ifdef BUTTON_SCAN
# Make sure we actually have drawing support
ifndef DRAW
DRAW:=1
endif
WITH_BUTTON_SCAN:=True
FEATURES_CPPFLAGS+=-DFBINK_WITH_BUTTON_SCAN
endif
WITH_BUTTON_SCAN:=True
FEATURES_CPPFLAGS+=-DFBINK_WITH_BUTTON_SCAN
endif

# Support tweaking a MINIMAL build to still include drawing primitives
Expand Down

0 comments on commit af1a15b

Please sign in to comment.