mifare client update

[proxmark3-svn] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index 144bee4387ae3a12d4fe070b2df82ac04519ee7c..66bdddab9a000c5b0ff097d5bc30e0c21325dd7f 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -9,6 +9,16 @@
 # (The including Makefile still needs to define what 'all' is)
 all:
 
 # (The including Makefile still needs to define what 'all' is)
 all:
 

+CROSS   = arm-elf-
+CC     = $(CROSS)gcc
+AS     = $(CROSS)as
+LD     = $(CROSS)ld
+OBJCOPY = $(CROSS)objcopy
+
+OBJDIR = obj
+
+INCLUDE = -I../include
+

 # 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
 # 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


@@ -16,16 +26,14 @@ ifeq ($(shell echo ""),)
 
 # This is probably a proper system, so we can use uname
 UNAME := $(shell uname)
 
 # This is probably a proper system, so we can use uname
 UNAME := $(shell uname)

-ifeq ($(UNAME), Linux)
-# Linux. (Todo: Add MacOS X if appropriate)

 DELETE=rm -rf
 MOVE=mv
 COPY=cp
 PATHSEP=/
 DELETE=rm -rf
 MOVE=mv
 COPY=cp
 PATHSEP=/

-DETECTED_OS=Linux
+FLASH_TOOL=client/flasher
+DETECTED_OS=UNAME

 # You may/should set this in your environment
 # You may/should set this in your environment

-ARMLIB ?= /usr/local/lib/gcc/arm-elf/4.3.3/interwork
-endif
+LIBGCC ?= $(shell $(CC) -print-file-name=interwork/libgcc.a)

 
 else
 
 
 else
 


@@ -34,27 +42,19 @@ DELETE=del /q
 MOVE=ren
 COPY=copy
 PATHSEP=\\#
 MOVE=ren
 COPY=copy
 PATHSEP=\\#

-ARMLIB ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork
+LIBGCC ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork/libgcc.a
+FLASH_TOOL=winsrc\\prox.exe

 DETECTED_OS=Windows
 
 endif
 
 DETECTED_OS=Windows
 
 endif
 

-CROSS   = arm-elf-
-CC     = $(CROSS)gcc
-AS     = $(CROSS)as
-LD     = $(CROSS)ld
-OBJCOPY = $(CROSS)objcopy
-
-OBJDIR = obj
-
-INCLUDE = -I../include

 
 # Also search prerequisites in the common directory (for usb.c), and the fpga directory (for fpga.bit)
 VPATH = . ../common/ ../fpga/
 
 
 # Also search prerequisites in the common directory (for usb.c), and the fpga directory (for fpga.bit)
 VPATH = . ../common/ ../fpga/
 

-INCLUDES = ../include/proxmark3.h ../include/at91sam7s128.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES)
+INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.h ../include/config_gpio.h ../include/usb_cmd.h $(APP_INCLUDES)

 
 

-CFLAGS =  -c $(INCLUDE) -Werror -pedantic -std=gnu99 $(APP_CFLAGS)
+CFLAGS =  -c $(INCLUDE) -Wall -Werror -pedantic -std=gnu99 $(APP_CFLAGS)

 
 THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))
 ARMOBJ   = $(patsubst %.c,$(OBJDIR)/%.o,$(ARMSRC))
 
 THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))
 ARMOBJ   = $(patsubst %.c,$(OBJDIR)/%.o,$(ARMSRC))