Fix UI disabler for debug builds

LedgerHQ · Oct 27, 2023 · fc47544 · fc47544
1 parent 7498063
commit fc47544
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/Makefile.defines b/Makefile.defines
@@ -172,8 +172,12 @@ LDFLAGS  += -L$(BOLOS_SDK)/arch/st33k1/lib/
 AFLAGS   += -mcpu=cortex-m35p+nodsp -mthumb
 endif
 
-NO_UI ?= 0
-ifeq ($(NO_UI), 0)
+DISABLE_UI ?= 0
+# Not compatible with debug builds
+ifneq ($(DEBUG),0)
+    DISABLE_UI = 0
+endif
+ifeq ($(DISABLE_UI), 0)
 ifeq ($(TARGET_NAME),TARGET_STAX)
 DEFINES += HAVE_BAGL_FONT_INTER_REGULAR_24PX
 DEFINES += HAVE_BAGL_FONT_INTER_SEMIBOLD_24PX

diff --git a/Makefile.rules b/Makefile.rules
@@ -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 ($(DISABLE_UI), 0)
+    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