From cf9d56dcc50c8c07de2040cb52aecfbdb297a3d1 Mon Sep 17 00:00:00 2001 From: dev_zzo Date: Mon, 17 Oct 2016 11:50:22 +0200 Subject: [PATCH 1/3] fix build on Windows --- Firmware/Chameleon-Mini/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Firmware/Chameleon-Mini/Makefile b/Firmware/Chameleon-Mini/Makefile index fb6337d..cd0c535 100644 --- a/Firmware/Chameleon-Mini/Makefile +++ b/Firmware/Chameleon-Mini/Makefile @@ -72,7 +72,11 @@ SPM_HELPER_ADDR = 0x21FE0 #Start of SPM helper section. Should be last 32Byte in SPM_HELPER_OBJCOPY = --set-section-flags=.spmhelper="alloc,load" #Build configuration -BUILD_DATE = $(shell date +'\"%y%m%d\"') +ifeq ($(OS),Windows_NT) +BUILD_DATE = $(shell date /t) +else +BUILD_DATE = $(shell date +'%y%m%d') +endif COMMIT_ID = $(shell git rev-parse --short HEAD) MCU = atxmega128a4u ARCH = XMEGA From 0ce5a6682b4dd6008faa64f4e4f7e3fbf8c16033 Mon Sep 17 00:00:00 2001 From: dev_zzo Date: Mon, 17 Oct 2016 12:20:48 +0200 Subject: [PATCH 2/3] fix build on Windows #2 --- Firmware/Chameleon-Mini/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Chameleon-Mini/Makefile b/Firmware/Chameleon-Mini/Makefile index cd0c535..506adbc 100644 --- a/Firmware/Chameleon-Mini/Makefile +++ b/Firmware/Chameleon-Mini/Makefile @@ -73,7 +73,7 @@ SPM_HELPER_OBJCOPY = --set-section-flags=.spmhelper="alloc,load" #Build configuration ifeq ($(OS),Windows_NT) -BUILD_DATE = $(shell date /t) +BUILD_DATE = "\"$(shell date /t)\"" else BUILD_DATE = $(shell date +'%y%m%d') endif @@ -91,7 +91,7 @@ SRC += Codec/Codec.c Codec/ISO14443-2A.c Codec/Reader14443-2A.c SRC += Application/MifareUltralight.c Application/MifareClassic.c Application/ISO14443-3A.c Application/Crypto1.c Application/Reader14443A.c SRC += $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) LUFA_PATH = ../LUFA -CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -DFLASH_DATA_ADDR=$(FLASH_DATA_ADDR) -DFLASH_DATA_SIZE=$(FLASH_DATA_SIZE) -DSPM_HELPER_ADDR=$(SPM_HELPER_ADDR) -DBUILD_DATE=$(BUILD_DATE) -DCOMMIT_ID=\"$(COMMIT_ID)\" $(SETTINGS) +CC_FLAGS = -DUSE_LUFA_CONFIG_HEADER -DFLASH_DATA_ADDR=$(FLASH_DATA_ADDR) -DFLASH_DATA_SIZE=$(FLASH_DATA_SIZE) -DSPM_HELPER_ADDR=$(SPM_HELPER_ADDR) -DBUILD_DATE=$(BUILD_DATE) -DCOMMIT_ID=\"$(COMMIT_ID)\" $(SETTINGS) LD_FLAGS = -Wl,--section-start=.flashdata=$(FLASH_DATA_ADDR) -Wl,--section-start=.spmhelper=$(SPM_HELPER_ADDR) OBJDIR = Bin OBJECT_FILES = From f245b0ed2ed2717c81434fcd8888f4ba76ed545b Mon Sep 17 00:00:00 2001 From: dev_zzo Date: Mon, 24 Oct 2016 15:24:37 +0200 Subject: [PATCH 3/3] fix build on Windows #3 --- Firmware/Chameleon-Mini/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/Chameleon-Mini/Makefile b/Firmware/Chameleon-Mini/Makefile index 506adbc..31599ad 100644 --- a/Firmware/Chameleon-Mini/Makefile +++ b/Firmware/Chameleon-Mini/Makefile @@ -75,7 +75,7 @@ SPM_HELPER_OBJCOPY = --set-section-flags=.spmhelper="alloc,load" ifeq ($(OS),Windows_NT) BUILD_DATE = "\"$(shell date /t)\"" else -BUILD_DATE = $(shell date +'%y%m%d') +BUILD_DATE = $(shell date +'\"%y%m%d\"') endif COMMIT_ID = $(shell git rev-parse --short HEAD) MCU = atxmega128a4u