Skip to content

Commit

Permalink
Fix UI disabler for debug builds
Browse files Browse the repository at this point in the history
  • Loading branch information
apaillier-ledger committed Oct 27, 2023
1 parent 7498063 commit 71360bf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
4 changes: 4 additions & 0 deletions Makefile.defines
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,10 @@ AFLAGS += -mcpu=cortex-m35p+nodsp -mthumb
endif

NO_UI ?= 0
# Not compatible with debug builds
ifneq ($(DEBUG),0)
NO_UI = 0
endif
ifeq ($(NO_UI), 0)
ifeq ($(TARGET_NAME),TARGET_STAX)
DEFINES += HAVE_BAGL_FONT_INTER_REGULAR_24PX
Expand Down
12 changes: 5 additions & 7 deletions Makefile.rules
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@
#*******************************************************************************

# temporary redef, to ensure wider compliance of the SDK with pre-1.6 apps
ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOS TARGET_NANOX TARGET_NANOS2))
ifeq ($(NO_UI), 0)
SDK_SOURCE_PATH += lib_bagl lib_ux
endif
else ifeq ($(TARGET_NAME),TARGET_STAX)
ifeq ($(NO_UI), 0)
SDK_SOURCE_PATH += lib_nbgl lib_ux_stax
endif
ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOS TARGET_NANOX TARGET_NANOS2))
SDK_SOURCE_PATH += lib_bagl lib_ux
else ifeq ($(TARGET_NAME),TARGET_STAX)
SDK_SOURCE_PATH += lib_nbgl lib_ux_stax
endif
endif

# adding the correct target header to sources
Expand Down

0 comments on commit 71360bf

Please sign in to comment.