fix target name for Windows compile

[proxmark3-svn] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index 51d60cce1b03a17c8479d0bf63f58227f26bc33e..6260eb05da4e5803f2f8d29b02be72ba0c3b46e4 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -22,6 +22,7 @@ DELETE=rm -rf
 MOVE=mv
 COPY=cp
 PATHSEP=/
+FLASH_TOOL=linux/flasher
 DETECTED_OS=Linux
 # You may/should set this in your environment
 ARMLIB ?= /usr/local/lib/gcc/arm-elf/4.3.3/interwork
@@ -35,6 +36,7 @@ MOVE=ren
 COPY=copy
 PATHSEP=\\#
 ARMLIB ?= ../../devkitARM/lib/gcc/arm-elf/4.1.0/interwork
+FLASH_TOOL=winsrc\\prox.exe
 DETECTED_OS=Windows
 
 endif
@@ -52,9 +54,9 @@ INCLUDE = -I../include
 # 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) -Wall $(APP_CFLAGS)
+CFLAGS =  -c $(INCLUDE) -Wall -Werror -pedantic -std=gnu99 $(APP_CFLAGS)
 
 THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(THUMBSRC))
 ARMOBJ   = $(patsubst %.c,$(OBJDIR)/%.o,$(ARMSRC))
@@ -76,11 +78,12 @@ $(VERSIONOBJ): $(OBJDIR)/%.o: %.c $(INCLUDES)
 # This objcopy call translates physical flash addresses to logical addresses
 # without touching start address or RAM addresses (.bss and .data sections)
 # See ldscript.common. -- Henryk Plötz <henryk@ploetzli.ch> 2009-08-27
-$(OBJDIR)/%.s19: $(OBJDIR)/%.elf
-       $(OBJCOPY) -Osrec --srec-forceS3 --strip-debug --no-change-warnings \
+OBJCOPY_TRANSLATIONS = --no-change-warnings \
        --change-addresses -0x100000 --change-start 0 \
        --change-section-address .bss+0 --change-section-address .data+0 \
-       --change-section-address .commonarea+0 $^ $@
+       --change-section-address .commonarea+0
+$(OBJDIR)/%.s19: $(OBJDIR)/%.elf
+       $(OBJCOPY) -Osrec --srec-forceS3 --strip-debug $(OBJCOPY_TRANSLATIONS) $^ $@
 
 # version.c should be remade on every compilation
 .PHONY: version.c