From 71360bfab0f13aa41b6583e374d38cdf0804e756 Mon Sep 17 00:00:00 2001
From: Alexandre Paillier <alexandre.paillier@ledger.fr>
Date: Fri, 27 Oct 2023 14:42:36 +0200
Subject: [PATCH] Fix UI disabler for debug builds

---
 Makefile.defines |  4 ++++
 Makefile.rules   | 12 +++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile.defines b/Makefile.defines
index 7675ae400..ce741b5b2 100644
--- a/Makefile.defines
+++ b/Makefile.defines
@@ -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
diff --git a/Makefile.rules b/Makefile.rules
index 5d06dc155..cf1dd8f99 100644
--- 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 ($(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