Merge pull request #52 from LedgerHQ/develop

Integrate last develop change to fix build issues with new SDK
LedgerHQ · Feb 15, 2023 · 40a8a0b · 40a8a0b
2 parents 218cff2 + 1066f40
commit 40a8a0b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,6 @@
 bin
 debug
-/dep
-obj
-src/u2f_crypto_data.h
-src/glyphs.h
-src/glyphs.c
+build
 src/delegates.h
 
 #ide

diff --git a/Makefile b/Makefile
@@ -171,13 +171,15 @@ delete:
 # import generic rules from the sdk
 include $(BOLOS_SDK)/Makefile.rules
 
-#add dependency on custom makefile filename
-dep/%.d: %.c Makefile
-
 listvariants:
 	@echo VARIANTS APP tezos_wallet tezos_baking
 
+# Define DEP_DIR to keep compatibility with old SDK
+ifeq ($(DEP_DIR),)
+	DEP_DIR := dep
+endif
+
 # Generate delegates from baker list
 src/delegates.h: tools/gen-delegates.sh tools/BakersRegistryCoreUnfilteredData.json
 	bash ./tools/gen-delegates.sh ./tools/BakersRegistryCoreUnfilteredData.json
-dep/to_string.d: src/delegates.h
+$(DEP_DIR)/to_string.d: src/delegates.h