Merge pull request #90 from 4m4rOk/master

[proxmark3-svn] / common / Makefile.common

diff --git a/common/Makefile.common b/common/Makefile.common
index 90a8fa5ad392b96c00fceb6b912956660751b33b..aa93433aac091af9eed992f3e9e3bed7a5e6c8e5 100644 (file)
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -47,7 +47,6 @@ COPY=cp
 PATHSEP=/
 FLASH_TOOL=client/flasher
 DETECTED_OS=$(UNAME)
-
 else
 
 # Assume that we are running on Windows.
@@ -55,12 +54,19 @@ DELETE=del /q
 MOVE=ren
 COPY=copy
 PATHSEP=\\#
-#FLASH_TOOL=winsrc\\prox.exe
-FLASH_TOOL=winsrc\\flash.exe
+FLASH_TOOL=client\\flasher.exe
 DETECTED_OS=Windows
 
 endif
 
+# uncomment these two; to enable EMV
+#APP_CFLAGS += -DWITH_EMV
+#COMMON_FLAGS += -DWITH_EMV
+
+# uncomment these two; to fix 256 vs 512kb PM3 devices
+# flashing bootrom -b is needed
+APP_CFLAGS += -DHAS_512_FLASH
+COMMON_FLAGS += -DHAS_512_FLASH
 
 # Also search prerequisites in the common directory (for usb.c), the fpga directory (for fpga.bit), and the zlib directory
 VPATH = . ../common ../fpga ../zlib
@@ -69,7 +75,6 @@ INCLUDES = ../include/proxmark3.h ../include/at91sam7s512.h ../include/config_gp
 
 CFLAGS =  -c $(INCLUDE) -Wall -Werror -pedantic -Wunused -std=c99 $(APP_CFLAGS) -Os
 LDFLAGS = -nostartfiles -nodefaultlibs -Wl,-gc-sections -n
-
 LIBS = -lgcc
 
 THUMBOBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(notdir $(THUMBSRC)))