Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 69e4738ad544e1328c96968c32887767c7f1b943..1c03e5a3b17275124dcb3070e69c5a774d38ba1a 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -10,14 +10,14 @@ 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 -fno-strict-aliasing
+APP_CFLAGS     = -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS -DWITH_LEGICRF -DWITH_HITAG  -DWITH_CRC -DON_DEVICE -fno-strict-aliasing -O2

 #-DWITH_LCD 
 
 #SRC_LCD = fonts.c LCD.c
 #-DWITH_LCD 
 
 #SRC_LCD = fonts.c LCD.c

-SRC_LF = lfops.c hitag2.c
-SRC_ISO15693 = iso15693.c iso15693tools.c 
-SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c 
-SRC_ISO14443b = iso14443.c 
+SRC_LF = lfops.c hitag2.c lfsampling.c
+SRC_ISO15693 = iso15693.c iso15693tools.c
+SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c
+SRC_ISO14443b = iso14443.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_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 
 


@@ -41,7 +41,9 @@ ARMSRC = fpgaloader.c \
        $(SRC_CRAPTO1) \
        $(SRC_CRC) \
        legic_prng.c \
        $(SRC_CRAPTO1) \
        $(SRC_CRC) \
        legic_prng.c \

-       iclass.c
+       iclass.c \
+       BigBuf.c \
+       optimized_cipher.c

 
 
 # stdint.h provided locally until GCC 4.5 becomes C99 compliant
 
 
 # stdint.h provided locally until GCC 4.5 becomes C99 compliant