FIX: strange bug in "lf em em410xwatch" , which the client crasches when it reads...

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 6281a190c0cf05e5486ddf1f9df64865433fde72..07227a2d55e343b8aa6a45f0c12a6ad7bd5f34f6 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -10,17 +10,20 @@ APP_INCLUDES = apps.h
 
 #remove one of the following defines and comment out the relevant line
 #in the next section to remove that particular feature from compilation  
 
 #remove one of the following defines and comment out the relevant line
 #in the next section to remove that particular feature from compilation  

-APP_CFLAGS     = -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS -DWITH_LEGICRF -DWITH_HITAG  -DWITH_CRC -DON_DEVICE \
-                               -fno-strict-aliasing -ffunction-sections -fdata-sections
-#-DWITH_LCD 
+APP_CFLAGS     = -DWITH_ISO14443a_StandAlone -DWITH_LF \
+                        -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS \
+                       -DWITH_LEGICRF -DWITH_HITAG -DWITH_CRC -DON_DEVICE -DWITH_HFSNOOP \
+                       -fno-strict-aliasing -ffunction-sections -fdata-sections
+                       #-DWITH_LCD

 
 #SRC_LCD = fonts.c LCD.c
 
 #SRC_LCD = fonts.c LCD.c

-SRC_LF = lfops.c hitag2.c lfsampling.c
+SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c protocols.c

 SRC_ISO15693 = iso15693.c iso15693tools.c
 SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c
 SRC_ISO14443b = iso14443b.c
 SRC_CRAPTO1 = crapto1.c crypto1.c des.c aes.c desfire_key.c desfire_crypto.c mifaredesfire.c
 SRC_CRC = iso14443crc.c crc.c crc16.c crc32.c 
 SRC_ISO15693 = iso15693.c iso15693tools.c
 SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c
 SRC_ISO14443b = iso14443b.c
 SRC_CRAPTO1 = crapto1.c crypto1.c des.c aes.c desfire_key.c desfire_crypto.c mifaredesfire.c
 SRC_CRC = iso14443crc.c crc.c crc16.c crc32.c 

+SRC_EMV = tlv.c emvdataels.c emvutil.c emvcmd.c                                                                         

 
 #the FPGA bitstream files. Note: order matters!
 FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit
 
 #the FPGA bitstream files. Note: order matters!
 FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit


@@ -47,12 +50,12 @@ THUMBSRC = start.c \
        util.c \
        string.c \
        usb_cdc.c \
        util.c \
        string.c \
        usb_cdc.c \

-       cmd.c
+       cmd.c \
+       ticks.c

 
 # These are to be compiled in ARM mode
 ARMSRC = fpgaloader.c \
        legicrf.c \
 
 # These are to be compiled in ARM mode
 ARMSRC = fpgaloader.c \
        legicrf.c \

-       lfdemod.c \

        $(SRC_ISO14443a) \
        $(SRC_ISO14443b) \
        $(SRC_CRAPTO1) \
        $(SRC_ISO14443a) \
        $(SRC_ISO14443b) \
        $(SRC_CRAPTO1) \


@@ -60,7 +63,10 @@ ARMSRC = fpgaloader.c \
        legic_prng.c \
        iclass.c \
        BigBuf.c \
        legic_prng.c \
        iclass.c \
        BigBuf.c \

-       optimized_cipher.c
+       optimized_cipher.c \
+       hfsnoop.c \
+       parity.c
+#  $(SRC_EMV)

 
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common
 
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
 include ../common/Makefile.common


@@ -70,6 +76,8 @@ FPGA_COMPRESSOR = ../client/fpga_compress
 
 all: $(OBJS)
 
 
 all: $(OBJS)
 

+.DELETE_ON_ERROR:
+

 $(OBJDIR)/fpga_all.o: $(OBJDIR)/fpga_all.bit.z
        $(OBJCOPY) -O elf32-littlearm -I binary -B arm --prefix-sections=fpga_all_bit $^ $@
 
 $(OBJDIR)/fpga_all.o: $(OBJDIR)/fpga_all.bit.z
        $(OBJCOPY) -O elf32-littlearm -I binary -B arm --prefix-sections=fpga_all_bit $^ $@