Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: LedgerHQ/ledger-secure-sdk
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ff7fff34ff7018f59b8f0475ccb4d4c102eec238
Choose a base ref
..
head repository: LedgerHQ/ledger-secure-sdk
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3be67890f4406a5201680828e12dacee7f513cf7
Choose a head ref
Showing with 3 additions and 3 deletions.
  1. +3 −3 Makefile.rules
6 changes: 3 additions & 3 deletions Makefile.rules
Original file line number Diff line number Diff line change
@@ -51,16 +51,16 @@ endif
# Retrieve SDK and APP sources separately
SOURCES_SDK += $(foreach libdir, src $(SDK_SOURCE_PATH), $(shell find $(BOLOS_SDK)/$(libdir) -name '*.[csS]'))
SOURCES_APP += $(SOURCE_FILES) $(foreach libdir, $(SOURCE_PATH) $(APP_SOURCE_PATH), $(shell find $(libdir) -name '*.[csS]')) $(GLYPH_DESTC) $(APP_SOURCE_FILES)
VPATH += $(call uniq,$(dir $(SOURCES_SDK)) $(dir $(SOURCES_APP)))
VPATH += $(call uniq, $(dir $(SOURCES_SDK) $(SOURCES_APP)))

# Retrieve APP header filenames
INCLUDES_APP += $(shell find $(APP_SOURCE_PATH) -name '*.h')
# Warn if a same header filename is found in both APP and SDK
$(call check_duplicate,$(INCLUDES_APP),$(BOLOS_SDK))
$(call check_duplicate, $(INCLUDES_APP), $(BOLOS_SDK))
# Retrieve header directories
INCLUDES_PATH += $(dir $(foreach libdir, $(SDK_SOURCE_PATH), $(dir $(shell find $(BOLOS_SDK)/$(libdir) -name '*.h')))) include $(BOLOS_SDK)/include $(BOLOS_SDK)/include/arm $(dir $(INCLUDES_APP)) $(GLYPH_SRC_DIR)
# Remove duplicate entries
INC_PATH = $(call uniq,$(INCLUDES_PATH))
INC_PATH = $(call uniq, $(INCLUDES_PATH))

# Separate object files from SDK and APP to avoid name conflicts
OBJECTS_SDK += $(sort $(addprefix $(OBJ_DIR)/sdk/, $(addsuffix .o, $(basename $(notdir $(SOURCES_SDK))))))