diff --git a/app/Makefile b/app/Makefile index 7d9d84aa..4780cc75 100755 --- a/app/Makefile +++ b/app/Makefile @@ -80,17 +80,17 @@ all: default ############ # Platform -DEFINES += UNUSED\(x\)=\(void\)x -DEFINES += PRINTF\(...\)= +DEFINES += UNUSED\(x\)=\(void\)x +DEFINES += PRINTF\(...\)= APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P) -DEFINES += APPVERSION=\"$(APPVERSION)\" +DEFINES += APPVERSION=\"$(APPVERSION)\" -DEFINES += OS_IO_SEPROXYHAL -DEFINES += HAVE_BAGL HAVE_SPRINTF -DEFINES += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=7 IO_HID_EP_LENGTH=64 HAVE_USB_APDU +DEFINES += OS_IO_SEPROXYHAL +DEFINES += HAVE_BAGL HAVE_SPRINTF +DEFINES += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=7 IO_HID_EP_LENGTH=64 HAVE_USB_APDU -DEFINES += LEDGER_MAJOR_VERSION=$(APPVERSION_M) LEDGER_MINOR_VERSION=$(APPVERSION_N) LEDGER_PATCH_VERSION=$(APPVERSION_P) +DEFINES += LEDGER_MAJOR_VERSION=$(APPVERSION_M) LEDGER_MINOR_VERSION=$(APPVERSION_N) LEDGER_PATCH_VERSION=$(APPVERSION_P) DEFINES += HAVE_U2F HAVE_IO_U2F DEFINES += U2F_PROXY_MAGIC=\"KSM\" @@ -98,8 +98,7 @@ DEFINES += USB_SEGMENT_SIZE=64 DEFINES += U2F_MAX_MESSAGE_SIZE=264 #257+5+2 DEFINES += HAVE_BOLOS_APP_STACK_CANARY -WEBUSB_URL = www.ledgerwallet.com -DEFINES += HAVE_WEBUSB WEBUSB_URL_SIZE_B=$(shell echo -n $(WEBUSB_URL) | wc -c) WEBUSB_URL=$(shell echo -n $(WEBUSB_URL) | sed -e "s/./\\\'\0\\\',/g") +DEFINES += HAVE_WEBUSB WEBUSB_URL_SIZE_B=0 WEBUSB_URL="" ifeq ($(TARGET_NAME),TARGET_NANOX) DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=300 diff --git a/app/Makefile.version b/app/Makefile.version index 82809770..145bf205 100644 --- a/app/Makefile.version +++ b/app/Makefile.version @@ -1,3 +1,3 @@ APPVERSION_M=1 APPVERSION_N=2008 -APPVERSION_P=0 +APPVERSION_P=1