X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/09c1ce4bdd7b694a5b68b0754fdc983530e2542a..33c7e2f3bc324a122fb9db8dca23efcd425a3cec:/common/Makefile.common diff --git a/common/Makefile.common b/common/Makefile.common index eb74c246..2b2bb2fb 100644 --- a/common/Makefile.common +++ b/common/Makefile.common @@ -15,9 +15,12 @@ # Make sure that all is the default target # (The including Makefile still needs to define what 'all' is) + +platform = $(shell uname) + all: -CROSS ?= arm-eabi- +CROSS ?= arm-none-eabi- CC = $(CROSS)gcc AS = $(CROSS)as LD = $(CROSS)ld @@ -27,6 +30,9 @@ OBJDIR = obj INCLUDE = -I../include -I../common +TAR=tar +TARFLAGS = -C .. -rvf + # Windows' echo echos its input verbatim, on Posix there is some # amount of shell command line parsing going on. echo "" on # Windows yields literal "", on Linux yields an empty line @@ -39,8 +45,7 @@ MOVE=mv COPY=cp PATHSEP=/ FLASH_TOOL=client/flasher -DETECTED_OS=UNAME -PATH := $(PATH):$(DEVKITARM)/bin +DETECTED_OS=$(UNAME) else @@ -49,7 +54,8 @@ DELETE=del /q MOVE=ren COPY=copy PATHSEP=\\# -FLASH_TOOL=winsrc\\prox.exe +#FLASH_TOOL=winsrc\\prox.exe +FLASH_TOOL=winsrc\\flash.exe DETECTED_OS=Windows endif @@ -60,8 +66,9 @@ VPATH = . ../common/ ../fpga/ INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES) -CFLAGS = -c $(INCLUDE) -Wall -Werror -pedantic -std=gnu99 $(APP_CFLAGS) +CFLAGS = -c $(INCLUDE) -Wall -Werror -pedantic -std=c99 $(APP_CFLAGS) -Os LDFLAGS = -nostartfiles -nodefaultlibs -Wl,-gc-sections -n + LIBS = -lgcc THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))